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 791)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 792)
@@ -13,8 +13,6 @@
  */
 public class TXMCoreMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.core.messages.messages"; //$NON-NLS-1$
-	
 	public static String common_cols;
 	public static String common_delete;
 	public static String common_description;
@@ -273,7 +271,7 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, TXMCoreMessages.class);
+		Utf8NLS.initializeMessages(TXMCoreMessages.class);
 	}
 	
 	
Index: tmp/org.txm.core/src/java/org/txm/objects/Base.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Base.java	(revision 791)
+++ tmp/org.txm.core/src/java/org/txm/objects/Base.java	(revision 792)
@@ -353,6 +353,10 @@
 	public String getDescription() {
 		return params.description;
 	}
+	
+	public void setDescription(String newDescription) {
+		params.description = newDescription;
+	}
 
 	public BaseParameters getBaseParameters() {
 		return params;
Index: tmp/org.txm.core/src/java/org/txm/objects/Corpus.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Corpus.java	(revision 791)
+++ tmp/org.txm.core/src/java/org/txm/objects/Corpus.java	(revision 792)
@@ -960,7 +960,18 @@
 	public String getDescription() {
 		return this.desc;
 	}
+	
+	/**
+	 * Gets the description.
+	 *
+	 * @return the description
+	 */
+	public void setDescription(String desc) {
+		this.desc = desc;
+		getSelfElement().setAttribute("desc", desc); // and update element
+	}
 
+
 	/**
 	 * Gets the script.
 	 *
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java	(revision 791)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java	(revision 792)
@@ -5,9 +5,6 @@
 
 public class IndexUIMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.index.rcp.messages.messages"; //$NON-NLS-1$
-
-	
 	public static String IndexEditor_0;
 	public static String IndexEditor_1;
 	public static String IndexEditor_10;
@@ -37,7 +34,7 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, IndexUIMessages.class);
+		Utf8NLS.initializeMessages(IndexUIMessages.class);
 	}
 
 	private IndexUIMessages() {
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/SWTComponentsProviderMessages.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/SWTComponentsProviderMessages.java	(revision 791)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/SWTComponentsProviderMessages.java	(revision 792)
@@ -5,8 +5,6 @@
 
 public class SWTComponentsProviderMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.chartsengine.rcp.messages.messages"; //$NON-NLS-1$
-	
 	public static String ChartsEnginePreferencePage_COMBO_FIELD_SELECT_DISPLAY_FORMAT_LABEL;
 	public static String ChartsEnginePreferencePage_COMBO_FIELD_SELECT_EXPORT_FORMAT_LABEL;
 	
@@ -43,7 +41,7 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, SWTComponentsProviderMessages.class);
+		Utf8NLS.initializeMessages(SWTComponentsProviderMessages.class);
 	}
 
 	private SWTComponentsProviderMessages() {
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java	(revision 791)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java	(revision 792)
@@ -12,8 +12,6 @@
  */
 public class ProgressionUIMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.progression.rcp.messages.messages"; //$NON-NLS-1$
-
 	public static String ProgressionPreferencePage_3;
 	public static String ProgressionPreferencePage_6;
 	public static String ProgressionPreferencePage_7;
@@ -31,7 +29,7 @@
 	
 	static {
 		// initializes resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, ProgressionUIMessages.class);
+		Utf8NLS.initializeMessages(ProgressionUIMessages.class);
 	}
 	
 	private ProgressionUIMessages() {
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java	(revision 791)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java	(revision 792)
@@ -132,10 +132,12 @@
 
 	private AssistedQueryWidget queryWidget;
 
+	private Label miniInfoLabel;
 
 
 
 
+
 	@Override
 	public void __createPartControl(Composite parent) {
 
@@ -180,29 +182,48 @@
 
 		try {
 			// Query:
-			getMainParametersComposite().getLayout().numColumns = 2;
+			getMainParametersComposite().getLayout().numColumns = 4;
 			// make
 			getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 			
-			Label queryLabel = new Label(getMainParametersComposite(), SWT.NONE);
-			queryLabel.setText("Add query");
-			queryLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			miniInfoLabel = new Label(getMainParametersComposite(), SWT.NONE);
+			miniInfoLabel.setText("No query - ");
+			miniInfoLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
+			
+//			Label queryLabel = new Label(getMainParametersComposite(), SWT.NONE);
+//			queryLabel.setText("New query");
+//			queryLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 
 			// [ (v)]
 			// queryWidget = new QueryWidget(queryArea, SWT.DROP_DOWN);
 			queryWidget = new AssistedQueryWidget(getMainParametersComposite(), SWT.DROP_DOWN, getResult().getCorpus());
-			queryWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+			queryWidget.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 			queryWidget.addKeyListener(new ComputeKeyListener(this) {
 				@Override
 				public void keyPressed(KeyEvent e) {
 					if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
-						if (onPlusButtonPressed(null, queryWidget.getRawString())) {
+						if (queryWidget.getRawString().length() > 0 && onPlusButtonPressed(null, queryWidget.getRawString())) {
 							super.keyPressed(e); // recompute only if the query has been added
 						}
 					}
 				}
 			});
 			
+			Button addNewQueryButton = new Button(getMainParametersComposite(), SWT.PUSH);
+			addNewQueryButton.setText("Add");
+			addNewQueryButton.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
+			addNewQueryButton.addSelectionListener(new SelectionListener() {
+				
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (queryWidget.getRawString().length() > 0 && onPlusButtonPressed(null, queryWidget.getRawString())) {
+						compute(true);
+					}
+				}
+				
+				@Override
+				public void widgetDefaultSelected(SelectionEvent e) { }
+			});
 			// System.out.println(parent.getLayout());
 			Composite mainPanel = this.getExtendedParametersComposite();
 			GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
@@ -261,7 +282,7 @@
 			bandeField = new Text(paramPanel, SWT.BORDER);
 			bandeField.setEnabled(densityButton.getSelection());
 			bandeField.setText("" + this.getResult().getBandeMultiplier()); //$NON-NLS-1$
-			bandeField.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1));
+			bandeField.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, true, 2, 1));
 
 			// Structural units and properties combo viewers
 			StructuralUnitsCombosGroup structuration = new StructuralUnitsCombosGroup(paramPanel, this, this.getResult().getStructuralUnit(), this.getResult().getStructuralUnitProperty());
@@ -372,6 +393,15 @@
 		return false;
 	}
 
+	public void updateMiniInfoLabelText() {
+		if (queryWidgets.size() == 0) {
+			miniInfoLabel.setText("No query - ");
+		} else if (queryWidgets.size() == 1) {
+			miniInfoLabel.setText(queryWidgets.size()+" query - ");
+		} else {
+			miniInfoLabel.setText(queryWidgets.size()+" queries - ");
+		}
+	}
 
 	/**
 	 * 
@@ -398,6 +428,8 @@
 			this.setLayout(glayout);
 
 			queryWidgets.add(this);
+			updateMiniInfoLabelText();
+			
 
 			focusTextBox = new AssistedQueryWidget(this, SWT.BORDER, getResult().getCorpus());
 			focusTextBox.setFocus();
@@ -418,6 +450,7 @@
 						QueryField lastwidget = QueryField.this;
 						lastwidget.setSize(200, 30);
 						queryWidgets.remove(QueryField.this);
+						updateMiniInfoLabelText();
 						lastwidget.dispose();
 						sc1.layout(true);
 						queriesFocusComposite.layout(true);
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/ConcordanceUIMessages.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/ConcordanceUIMessages.java	(revision 791)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/ConcordanceUIMessages.java	(revision 792)
@@ -5,8 +5,6 @@
 
 public class ConcordanceUIMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.concordance.rcp.messages.messages"; //$NON-NLS-1$
-	
 	public static String ConcordancesEditor_referenceColumn_text;
 	public static String ConcordancesEditor_xpndtmNewExpanditem_text;
 	public static String ConcordancesEditor_xpndtmNewParameters_text;
@@ -139,7 +137,7 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, ConcordanceUIMessages.class);
+		Utf8NLS.initializeMessages(ConcordanceUIMessages.class);
 	}
 	
 }
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/messages/ProgressionCoreMessages.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/messages/ProgressionCoreMessages.java	(revision 791)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/messages/ProgressionCoreMessages.java	(revision 792)
@@ -1,6 +1,7 @@
 package org.txm.progression.core.messages;
 
 import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
 
 /**
  * Progression core messages.
@@ -11,11 +12,8 @@
  */
 public class ProgressionCoreMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.progression.core.messages.messages"; //$NON-NLS-1$
-
 	public static String RESULT_TYPE;
 
-	
 	public static String ChartsEngine_PROGRESSION_X_AXIS_LABEL;
 	public static String ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL;
 	public static String ChartsEngine_PROGRESSION_Y_AXIS_NOT_CUMULATIVE_LABEL;
@@ -36,7 +34,7 @@
 	
 	static {
 		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, ProgressionCoreMessages.class);
+		Utf8NLS.initializeMessages(ProgressionCoreMessages.class);
 	}
 
 	private ProgressionCoreMessages() {
Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/ChartsEngineCoreMessages.java
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/ChartsEngineCoreMessages.java	(revision 791)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/ChartsEngineCoreMessages.java	(revision 792)
@@ -11,9 +11,6 @@
  */
 public class ChartsEngineCoreMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.chartsengine.core.messages.messages"; //$NON-NLS-1$
-
-	
 	public static String error_cantCreateTmpChartFile;
 	public static String error_cantWriteInFile;
 
@@ -21,7 +18,7 @@
 
 	
 	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, ChartsEngineCoreMessages.class);
+		Utf8NLS.initializeMessages(ChartsEngineCoreMessages.class);
 	}
 	
 }
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 791)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/ReferencerUIMessages.java	(revision 792)
@@ -13,9 +13,6 @@
  */
 public class ReferencerUIMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.referencer.rcp.messages.messages"; //$NON-NLS-1$
-
-
 	public static String ReferencerEditor_0;
 	public static String ReferencerEditor_10;
 	public static String ReferencerEditor_11;
@@ -33,10 +30,9 @@
 	public static String ReferencerPreferencePage_2;
 	public static String ReferencerPreferencePage_3;
 
-	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, ReferencerUIMessages.class);
+		Utf8NLS.initializeMessages(ReferencerUIMessages.class);
 	}
 
 	private ReferencerUIMessages() {
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 791)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/CQPSearchEngineCoreMessages.java	(revision 792)
@@ -13,11 +13,9 @@
  */
 public class CQPSearchEngineCoreMessages extends NLS {
 
-	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);
+		Utf8NLS.initializeMessages(CQPSearchEngineCoreMessages.class);
 	}
 
 	private CQPSearchEngineCoreMessages() {
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/ConcordanceMessages.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/ConcordanceMessages.java	(revision 791)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/ConcordanceMessages.java	(revision 792)
@@ -12,8 +12,6 @@
  */
 public class ConcordanceMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.concordance.core.messages.messages"; //$NON-NLS-1$
-
 	public static String Concordance_0;
 	public static String Concordance_1;
 	public static String Concordance_12;
@@ -40,6 +38,6 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, ConcordanceMessages.class);
+		Utf8NLS.initializeMessages(ConcordanceMessages.class);
 	}
 }
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/RUIMessages.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/RUIMessages.java	(revision 791)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/RUIMessages.java	(revision 792)
@@ -4,10 +4,7 @@
 import org.txm.utils.messages.Utf8NLS;
 
 public class RUIMessages extends NLS {
-	
 
-	private static final String BUNDLE_NAME = "org.txm.statsengine.r.rcp.messages.messages"; //$NON-NLS-1$
-	
 	public static String RPreferencePage_0;
 	public static String RPreferencePage_1;
 	public static String RPreferencePage_2;
@@ -58,10 +55,9 @@
 	public static String RVariablesView_2;
 	public static String RVariablesView_9;
 
-	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, RUIMessages.class);
+		Utf8NLS.initializeMessages( RUIMessages.class);
 	}
 
 	private RUIMessages() {
Index: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/editors/PropertiesEditor.java
===================================================================
--- tmp/org.txm.information.rcp/src/org/txm/properties/rcp/editors/PropertiesEditor.java	(revision 0)
+++ tmp/org.txm.information.rcp/src/org/txm/properties/rcp/editors/PropertiesEditor.java	(revision 792)
@@ -0,0 +1,159 @@
+package org.txm.properties.rcp.editors;
+
+import java.io.File;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.custom.StyledText;
+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.layout.RowData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Spinner;
+import org.eclipse.swt.widgets.Text;
+import org.txm.core.results.Parameter;
+import org.txm.properties.core.functions.Properties;
+import org.txm.properties.core.preferences.PropertiesPreferences;
+import org.txm.rcp.editors.TXMEditor;
+import org.txm.rcp.editors.listeners.ComputeSelectionListener;
+import org.txm.rcp.swt.GLComposite;
+import org.txm.rcp.views.corpora.CorporaView;
+import org.txm.utils.logger.Log;
+
+/**
+ * Corpus, Subcorpus or Partition information editor.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class PropertiesEditor extends TXMEditor<Properties> {
+
+
+	/**
+	 * The browser to display the HTML file.
+	 */
+	private Browser browser;
+
+
+	/**
+	 * The maximum number of word property values to display.
+	 */
+	@Parameter(key=PropertiesPreferences.MAX_PROPERTIES_TO_DISPLAY)
+	protected Spinner maxPropertiesToDisplay;
+
+
+	private Button nameSaveButton;
+
+
+	private Text nameText;
+
+
+	private StyledText descriptionText;
+
+
+	private Button descriptionSaveButton;
+
+
+
+	@Override
+	public void _createPartControl(Composite parent) {
+
+		Composite parametersArea = this.getExtendedParametersComposite();
+
+		// label
+		new Label(parametersArea, SWT.NONE).setText("V max");
+
+		// spinner
+		this.maxPropertiesToDisplay = new Spinner(parametersArea, SWT.BORDER);
+		this.maxPropertiesToDisplay.setToolTipText("The maximum number of word property values to show");
+		this.maxPropertiesToDisplay.setMinimum(0);
+		RowData gdata = new RowData();
+		gdata.width = 100;
+		this.maxPropertiesToDisplay.setLayoutData(gdata);
+		this.maxPropertiesToDisplay.addSelectionListener(new ComputeSelectionListener(this));
+
+		Group editComposite = this.getTopToolbar().installGroup("edit", "edit properties", null, null, true);
+		editComposite.setLayout(GLComposite.createDefaultLayout(3));
+		
+		Label nameLabel = new Label(editComposite, SWT.NONE);
+		nameLabel.setText("Displayed name");
+
+		nameText = new Text(editComposite, SWT.BORDER);
+		nameText.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
+		nameSaveButton = new Button(editComposite, SWT.PUSH);
+		nameSaveButton.setText("Change name");
+		nameSaveButton.addSelectionListener(new SelectionListener() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				String newName = nameText.getText().trim();
+				if (newName.length() > 0) {
+					getResult().getCorpus().setUserName(newName);
+					CorporaView.refreshObject(getResult().getCorpus());
+				}
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) { }
+		});
+
+		Label descLabel = new Label(editComposite, SWT.NONE);
+		descLabel.setText("Description");
+
+		descriptionText = new StyledText(editComposite, SWT.BORDER|SWT.V_SCROLL);
+		descriptionText.setLayoutData(GridDataFactory.fillDefaults().hint(400, 100).minSize(400, 100).span(1, 2).create());
+		descriptionSaveButton = new Button(editComposite, SWT.PUSH);
+		descriptionSaveButton.setText("Change description");
+		descriptionSaveButton.addSelectionListener(new SelectionListener() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				String newDescription = descriptionText.getText().trim();
+				if (newDescription.length() > 0) {
+					getResult().getCorpus().setDescription(newDescription);
+					getResult().setDirty();
+					compute(true);
+				}
+			}
+
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) { }
+		});
+
+		// browser
+		GLComposite displayArea = this.getResultArea();
+
+		this.browser = new Browser(displayArea, SWT.NONE);
+		this.browser.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
+	}
+
+	@Override
+	public void updateEditorFromResult(boolean update) {
+		File file = this.getResult().getHTMLFile();
+		if (file.exists()) {
+			this.browser.setUrl(file.getAbsolutePath());
+		}
+		else	{
+			Log.severe("Information HTML file doesn't exist."); //$NON-NLS-1$
+		}
+		String n = getResult().getCorpus().getUserName();
+		if (n == null) n = getResult().getCorpus().getName();
+		nameText.setText(n);
+
+		String d = getResult().getCorpus().getDescription();
+		if (d != null) {
+			descriptionText.setText(getResult().getCorpus().getDescription());
+		}
+	}
+
+	@Override
+	public void updateResultFromEditor() {
+		// nothing to do
+	}
+
+}

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

Index: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/handlers/ComputeProperties.java
===================================================================
--- tmp/org.txm.information.rcp/src/org/txm/properties/rcp/handlers/ComputeProperties.java	(revision 0)
+++ tmp/org.txm.information.rcp/src/org/txm/properties/rcp/handlers/ComputeProperties.java	(revision 792)
@@ -0,0 +1,75 @@
+// 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.properties.rcp.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.txm.properties.core.functions.Properties;
+import org.txm.properties.rcp.editors.PropertiesEditor;
+import org.txm.rcp.editors.TXMEditor;
+import org.txm.rcp.handlers.BaseAbstractHandler;
+import org.txm.rcp.views.corpora.CorporaView;
+import org.txm.searchengine.cqp.corpus.Corpus;
+
+/**
+ * Calls the function Information on a MainCorpus or a SubCorpus.
+ * Displays basic statistics and gives some properties values. 
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ */
+public class ComputeProperties extends BaseAbstractHandler {
+	
+	
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		if (!this.checkCorpusEngine())	{
+			return false;
+		}
+		
+		Object selection = this.getSelection(event);
+		Properties information = null;
+		
+		// Creating from Corpus
+		if (selection instanceof Corpus) {
+			information = new Properties((Corpus) selection);
+		}
+		// Reopening from existing result
+		else if(selection instanceof Properties)	{
+			information = (Properties) selection;
+		}
+		// Error
+		else	{
+			return super.logCanNotCompute(selection);
+		}
+		
+		TXMEditor.openEditor(information, PropertiesEditor.class.getName());
+		return null;
+	}
+}

Property changes on: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/handlers/ComputeProperties.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/preferences/PropertiesPreferencePage.java
===================================================================
--- tmp/org.txm.information.rcp/src/org/txm/properties/rcp/preferences/PropertiesPreferencePage.java	(revision 0)
+++ tmp/org.txm.information.rcp/src/org/txm/properties/rcp/preferences/PropertiesPreferencePage.java	(revision 792)
@@ -0,0 +1,64 @@
+// 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.properties.rcp.preferences;
+
+import org.eclipse.jface.preference.IntegerFieldEditor;
+import org.eclipse.ui.IWorkbench;
+import org.txm.core.messages.TXMCoreMessages;
+import org.txm.properties.core.preferences.PropertiesPreferences;
+import org.txm.properties.rcp.messages.PropertiesUIMessages;
+import org.txm.rcp.preferences.TXMPreferencePage;
+import org.txm.rcp.preferences.TXMPreferenceStore;
+import org.txm.searchengine.cqp.CQPPreferences;
+
+/**
+ * Information preferences page.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class PropertiesPreferencePage extends TXMPreferencePage {
+
+		
+	@Override
+	public void init(IWorkbench workbench) {
+		this.setPreferenceStore(new TXMPreferenceStore(PropertiesPreferences.PREFERENCES_NODE));
+		this.setTitle(TXMCoreMessages.common_description);
+	}
+	
+
+	@Override
+	public void createFieldEditors() {
+		
+		// The maximum number of word property values to display
+		IntegerFieldEditor maxValue = new IntegerFieldEditor(PropertiesPreferences.MAX_PROPERTIES_TO_DISPLAY, PropertiesUIMessages.Max_Value_To_Display, this.getFieldEditorParent());
+		maxValue.setValidRange(1, 9999);
+		this.addField(maxValue);
+	}
+}

Property changes on: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/preferences/PropertiesPreferencePage.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/adapters/PropertiesAdapterFactory.java
===================================================================
--- tmp/org.txm.information.rcp/src/org/txm/properties/rcp/adapters/PropertiesAdapterFactory.java	(revision 0)
+++ tmp/org.txm.information.rcp/src/org/txm/properties/rcp/adapters/PropertiesAdapterFactory.java	(revision 792)
@@ -0,0 +1,40 @@
+// Copyright © 2010-2013 ENS de Lyon.
+package org.txm.properties.rcp.adapters;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.model.IWorkbenchAdapter;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.FrameworkUtil;
+import org.txm.properties.core.functions.Properties;
+import org.txm.rcp.adapters.TXMResultAdapter;
+import org.txm.rcp.adapters.TXMResultAdapterFactory;
+
+
+/**
+ * 
+ *  
+ * @author mdecorde
+ * @author sjacquot
+ */
+public class PropertiesAdapterFactory extends TXMResultAdapterFactory {
+
+	public static final ImageDescriptor ICON =
+			AbstractUIPlugin.imageDescriptorFromPlugin(FrameworkUtil.getBundle(PropertiesAdapterFactory.class).getSymbolicName(),
+					"platform:/plugin/"+ FrameworkUtil.getBundle(PropertiesAdapterFactory.class).getSymbolicName() + "/icons/functions/information.png"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	@Override
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Properties)	{
+			return new TXMResultAdapter() {
+				@Override
+				public ImageDescriptor getImageDescriptor(Object object) {
+					if (object instanceof Properties) {
+							return ICON;
+					}
+					return null;
+				}
+			};
+		}
+		return null;
+	}
+}

Property changes on: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/adapters/PropertiesAdapterFactory.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/PropertiesUIMessages.java
===================================================================
--- tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/PropertiesUIMessages.java	(revision 0)
+++ tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/PropertiesUIMessages.java	(revision 792)
@@ -0,0 +1,36 @@
+package org.txm.properties.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * CAP UI messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class PropertiesUIMessages extends NLS {
+	
+	public static String CQPPreferencePage_0;
+	public static String CQPPreferencePage_1;
+	public static String CQPPreferencePage_10;
+	public static String CQPPreferencePage_11;
+	public static String CQPPreferencePage_12;
+	public static String CQPPreferencePage_13;
+	public static String CQPPreferencePage_14;
+	public static String CQPPreferencePage_15;
+	public static String CQPPreferencePage_17;
+	public static String CQPPreferencePage_18;
+	
+	
+	public static String ComputeProperties_0;
+
+	public static String Max_Value_To_Display;
+
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(PropertiesUIMessages.class);
+	}
+}

Property changes on: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/PropertiesUIMessages.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/messages.properties	(revision 0)
+++ tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/messages.properties	(revision 792)
@@ -0,0 +1,3 @@
+ComputeProperties_0 = Selection is not structured
+
+Max_Value_To_Display = Maximum values to display

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

Index: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/messages_ru.properties	(revision 0)
+++ tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/messages_ru.properties	(revision 792)
@@ -0,0 +1,13 @@
+
+CQPPreferencePage_0  = 
+CQPPreferencePage_1  = Использовать сетевой протокол
+CQPPreferencePage_10 = Удаленный &сервер CWB
+CQPPreferencePage_11 = Удаленный сервер: &имя машины
+CQPPreferencePage_12 = Удаленный сервер: &номер порта
+CQPPreferencePage_13 = Удаленный сервер: &логин
+CQPPreferencePage_14 = Удаленный сервер: &пароль
+CQPPreferencePage_15 = Путь к исполняемому &файлу 'cqpserver'
+CQPPreferencePage_17 = Путь к файлу инициализации сервера CWB
+CQPPreferencePage_18 = Дополнительные опции сервера CWB: 
+
+Max_Value_To_Display = Число отображаемых значений свойства

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

Index: tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/messages_fr.properties	(revision 0)
+++ tmp/org.txm.information.rcp/src/org/txm/properties/rcp/messages/messages_fr.properties	(revision 792)
@@ -0,0 +1 @@
+Max_Value_To_Display = Nombre de valeurs de propri�t� affich�

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

Index: tmp/org.txm.information.rcp/OSGI-INF/l10n/bundle.properties
===================================================================
--- tmp/org.txm.information.rcp/OSGI-INF/l10n/bundle.properties	(revision 791)
+++ tmp/org.txm.information.rcp/OSGI-INF/l10n/bundle.properties	(revision 792)
@@ -1 +1 @@
-command.name=Information
\ No newline at end of file
+command.name=Properties
\ No newline at end of file
Index: tmp/org.txm.information.rcp/OSGI-INF/l10n/bundle_fr.properties
===================================================================
--- tmp/org.txm.information.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 791)
+++ tmp/org.txm.information.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 792)
@@ -1 +1 @@
-command.name=Information
+command.name=Propri�t�s
Index: tmp/org.txm.information.rcp/icons/functions/information.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.information.rcp/icons/functions/properties.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.information.rcp/icons/functions/properties.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.information.rcp/plugin.xml
===================================================================
--- tmp/org.txm.information.rcp/plugin.xml	(revision 791)
+++ tmp/org.txm.information.rcp/plugin.xml	(revision 792)
@@ -5,27 +5,27 @@
          point="org.eclipse.ui.preferencePages">
       <page
             category="org.txm.rcp.preferences.UserPreferencePage"
-            class="org.txm.information.rcp.preferences.InformationPreferencePage"
-            id="org.txm.information.rcp.preferences.InformationPreferencePage"
+            class="org.txm.properties.rcp.preferences.PropertiesPreferencePage"
+            id="org.txm.properties.rcp.preferences.PropertiesPreferencePage"
             name="%command.name">
       </page>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
       <command
-            defaultHandler="org.txm.information.rcp.handlers.ComputeInformation"
-            id="org.txm.information.rcp.handlers.ComputeInformation"
+            defaultHandler="org.txm.properties.rcp.handlers.ComputeProperties"
+            id="org.txm.properties.rcp.handlers.ComputeProperties"
             name="%command.name"
-            returnTypeId="org.txm.information.core.functions.Information">
+            returnTypeId="org.txm.properties.core.functions.Properties">
       </command>
    </extension>
    <extension
          point="org.eclipse.ui.editors">
       <editor
-            class="org.txm.information.rcp.editors.InformationEditor"
+            class="org.txm.properties.rcp.editors.PropertiesEditor"
             default="false"
-            icon="icons/functions/information.png"
-            id="org.txm.information.rcp.editors.InformationEditor"
+            icon="icons/functions/properties.png"
+            id="org.txm.properties.rcp.editors.PropertiesEditor"
             name="%command.name">
       </editor>
    </extension>
@@ -33,7 +33,7 @@
          point="org.eclipse.core.runtime.adapters">
       <factory
             adaptableType="org.txm.information.core.functions.Information"
-            class="org.txm.information.rcp.adapters.InformationAdapterFactory">
+            class="org.txm.properties.rcp.adapters.PropertiesAdapterFactory">
          <adapter
                type="org.eclipse.ui.model.IWorkbenchAdapter">
          </adapter>
@@ -44,8 +44,8 @@
       <menuContribution
             locationURI="toolbar:org.txm.rcp.toolbarcorpus?after=org.txm.synopticedition.rcp.handlers.OpenEdition">
          <command
-               commandId="org.txm.information.rcp.handlers.ComputeInformation"
-               icon="icons/functions/information.png"
+               commandId="org.txm.properties.rcp.handlers.ComputeProperties"
+               icon="icons/functions/properties.png"
                style="push"
                tooltip="%command.name">
             <visibleWhen
@@ -61,8 +61,8 @@
       <menuContribution
             locationURI="menu:menu.corpus?after=menu.corpus.read">
          <command
-               commandId="org.txm.information.rcp.handlers.ComputeInformation"
-               icon="icons/functions/information.png"
+               commandId="org.txm.properties.rcp.handlers.ComputeProperties"
+               icon="icons/functions/properties.png"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -75,8 +75,8 @@
       <menuContribution
             locationURI="popup:org.txm.rcp.views.corpora.CorporaView?after=org.txm.rcp.corporaview.corpus.read">
          <command
-               commandId="org.txm.information.rcp.handlers.ComputeInformation"
-               icon="icons/functions/information.png"
+               commandId="org.txm.properties.rcp.handlers.ComputeProperties"
+               icon="icons/functions/properties.png"
                style="push">
             <visibleWhen
                   checkEnabled="false">
Index: tmp/org.txm.information.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.information.rcp/META-INF/MANIFEST.MF	(revision 791)
+++ tmp/org.txm.information.rcp/META-INF/MANIFEST.MF	(revision 792)
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Information RCP
-Bundle-SymbolicName: org.txm.information.rcp;singleton:=true
+Bundle-SymbolicName: org.txm.properties.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Textometrie.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.ui;bundle-version="3.106.1",
  org.txm.utils,
  org.txm.searchengine.cqp.core;bundle-version="1.1.0",
- org.txm.information.core;bundle-version="1.0.0",
+ org.txm.properties.core;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.10.0",
  org.txm.rcp;bundle-version="0.8.0"
Index: tmp/org.txm.information.rcp/.project
===================================================================
--- tmp/org.txm.information.rcp/.project	(revision 791)
+++ tmp/org.txm.information.rcp/.project	(revision 792)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.txm.information.rcp</name>
+	<name>org.txm.properties.rcp</name>
 	<comment></comment>
 	<projects>
 	</projects>
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java	(revision 791)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java	(revision 792)
@@ -12,9 +12,6 @@
  */
 public class CACoreMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.ca.core.messages.messages"; //$NON-NLS-1$
-
-
 	public static String charts_error_factorialMap_cantCreateCAChartFile;
 	public static String charts_error_singularValues_cantCreateSingularValuesChart;
 
@@ -54,8 +51,6 @@
 	public static String error_unableToExtractSingularValues;
 
 	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CACoreMessages.class);
+		Utf8NLS.initializeMessages(CACoreMessages.class);
 	}
-
-	
 }
Index: tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/TreeTaggerUIMessages.java
===================================================================
--- tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/TreeTaggerUIMessages.java	(revision 791)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/TreeTaggerUIMessages.java	(revision 792)
@@ -13,17 +13,14 @@
  */
 public class TreeTaggerUIMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.treetagger.rcp.messages.messages"; //$NON-NLS-1$
-
 	public static String TreeTaggerPreferencePage_0;
 	public static String TreeTaggerPreferencePage_1;
 	public static String TreeTaggerPreferencePage_2;
 	public static String TreeTaggerPreferencePage_3;
 	
-
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, TreeTaggerUIMessages.class);
+		Utf8NLS.initializeMessages(TreeTaggerUIMessages.class);
 	}
 
 	private TreeTaggerUIMessages() {
Index: tmp/org.txm.rcp.feature/feature.xml
===================================================================
--- tmp/org.txm.rcp.feature/feature.xml	(revision 791)
+++ tmp/org.txm.rcp.feature/feature.xml	(revision 792)
@@ -116,7 +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.txm.properties.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"/>
@@ -523,14 +523,14 @@
          unpack="false"/>
 
    <plugin
-         id="org.txm.information.core"
+         id="org.txm.properties.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.txm.information.rcp"
+         id="org.txm.properties.rcp"
          download-size="0"
          install-size="0"
          version="0.0.0"
Index: tmp/org.txm.queryindex.rcp/src/org/txm/functions/queryindex/Messages.java
===================================================================
--- tmp/org.txm.queryindex.rcp/src/org/txm/functions/queryindex/Messages.java	(revision 791)
+++ tmp/org.txm.queryindex.rcp/src/org/txm/functions/queryindex/Messages.java	(revision 792)
@@ -13,8 +13,6 @@
  */
 public class Messages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.partition.core.messages.messages"; //$NON-NLS-1$
-
 	public static String QueryIndexEditor_0;
 	public static String QueryIndexEditor_1;
 	public static String QueryIndexEditor_10;
@@ -30,7 +28,7 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		Utf8NLS.initializeMessages(Messages.class);
 	}
 
 	private Messages() {
Index: tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/LexicalTableCoreMessages.java
===================================================================
--- tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/LexicalTableCoreMessages.java	(revision 791)
+++ tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/LexicalTableCoreMessages.java	(revision 792)
@@ -5,8 +5,6 @@
 
 public class LexicalTableCoreMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.lexicaltable.core.messages.messages"; //$NON-NLS-1$
-	
 	public static String LexicalTableImpl_1;
 	public static String LexicalTableImpl_10;
 	public static String LexicalTableImpl_12;
@@ -17,6 +15,6 @@
 
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, LexicalTableCoreMessages.class);
+		Utf8NLS.initializeMessages(LexicalTableCoreMessages.class);
 	}
 }
Index: tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java
===================================================================
--- tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java	(revision 791)
+++ tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java	(revision 792)
@@ -13,7 +13,6 @@
 public class AHCCoreMessages extends NLS {
 	
 	
-	private static final String BUNDLE_NAME = "org.txm.ahc.core.messages.messages"; //$NON-NLS-1$
 
 	public static String RESULT_TYPE;
 	
@@ -22,7 +21,7 @@
 	
 	
 	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, AHCCoreMessages.class);
+		Utf8NLS.initializeMessages(AHCCoreMessages.class);
 	}
 	
 
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 791)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 792)
@@ -6,11 +6,6 @@
 
 public class TXMUIMessages extends NLS {
 	
-	// The Constant BUNDLE_NAME. 
-	private static final String BUNDLE_NAME = "org.txm.rcp.messages.messages"; //$NON-NLS-1$
-	
-	
-	
 	public static String About_Menu_Label;
 	public static String AdapterFactory_0;
 	public static String AddBase_10;
@@ -573,11 +568,9 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, TXMUIMessages.class);
-		//NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		Utf8NLS.initializeMessages(TXMUIMessages.class);
 	}
 
-
 	private TXMUIMessages() {
 	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/debug/TXMEditorSWTDebugView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/debug/TXMEditorSWTDebugView.java	(revision 0)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/debug/TXMEditorSWTDebugView.java	(revision 792)
@@ -0,0 +1,202 @@
+// 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.rcp.views.debug;
+
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IPartService;
+import org.eclipse.ui.IPropertyListener;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.ViewPart;
+import org.txm.chartsengine.core.results.ChartResult;
+import org.txm.core.results.TXMResult;
+import org.txm.rcp.editors.TXMEditor;
+import org.txm.rcp.views.corpora.CorporaView;
+import org.txm.searchengine.cqp.corpus.Corpus;
+
+
+/**
+ * Debug view for TXMResult.
+ * 
+ * @author sjacquot
+ */
+public class TXMEditorSWTDebugView extends ViewPart implements IPartListener, IPropertyListener {
+
+	/**
+	 * Display area.
+	 */
+	protected TreeViewer treeViewer;
+
+	/**
+	 * Instantiates a new queries view.
+	 */
+	public TXMEditorSWTDebugView() {
+		IPartService service = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService();
+		service.addPartListener(this);
+	}
+
+	@Override
+	public void dispose() {
+		IPartService service = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService();
+		service.removePartListener(this);
+	}
+
+	@Override
+	public void createPartControl(Composite parent) {
+		treeViewer = new TreeViewer (parent, SWT.NONE);
+		treeViewer.setContentProvider(new ITreeContentProvider() {
+			
+			@Override
+			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { }
+			
+			@Override
+			public void dispose() { }
+			
+			@Override
+			public boolean hasChildren(Object element) {
+				if (element instanceof Composite) {
+					return ((Composite)element).getChildren().length > 0;
+				} else if (element instanceof Control) {
+					return false;
+				}
+				return false;
+			}
+			
+			@Override
+			public Object getParent(Object element) {
+				if (element instanceof Composite) {
+					return ((Composite)element).getParent();
+				} else if (element instanceof Control) {
+					return ((Control)element).getParent();
+				}
+				return null;
+			}
+			
+			@SuppressWarnings("rawtypes")
+			@Override
+			public Object[] getElements(Object inputElement) {
+				if (inputElement == null) return new Object[0];
+				
+				if (inputElement instanceof TXMEditor) {
+					return ((TXMEditor)inputElement).getContainer().getChildren();
+				}
+				return null;
+			}
+			
+			@Override
+			public Object[] getChildren(Object element) {
+				if (element instanceof Composite) {
+					return ((Composite)element).getChildren();
+				} else if (element instanceof Control) {
+					return new Object[0];
+				}
+				return new Object[0];
+			}
+		});
+		treeViewer.setLabelProvider(new LabelProvider() {
+			@Override
+			public final String getText(Object element) {
+				if (element instanceof Composite) {
+					Composite c = (Composite)element;
+					return c.toString()+" "+c.getLayout() ;
+				}
+//				else if (element instanceof Control) {
+//					return ((Composite)element).getLayout().getClass().getSimpleName();
+//				}
+				return element.toString();
+			}
+		});
+		
+		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
+			
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				Object o = ((StructuredSelection)event.getSelection()).getFirstElement();
+				if (o != null && o instanceof Control) {
+					Control w = (Control) o;
+					Color b = w.getDisplay().getSystemColor(SWT.COLOR_BLUE);
+					Color current = w.getBackground();
+					
+					if (current != null 
+							&& current.getGreen() == b.getGreen()
+							&& current.getBlue() == b.getBlue()
+							&& current.getRed() == b.getRed()) {
+						w.setBackground(null);
+					} else {
+						w.setBackground(b);
+					}
+					
+				}
+			}
+		});
+	}
+	@Override
+	public void partActivated(IWorkbenchPart part) {
+		if (part == null)
+			return;
+		// System.out.println("partActivated: "+part);
+		if (part instanceof TXMEditor) {
+			treeViewer.setInput(part);
+		}
+	}
+
+	@Override
+	public void propertyChanged(Object source, int propId) { }
+
+	@Override
+	public void partBroughtToTop(IWorkbenchPart part) { }
+
+	@Override
+	public void partClosed(IWorkbenchPart part) {treeViewer.setInput(null);}
+
+	@Override
+	public void partDeactivated(IWorkbenchPart part) { }
+
+	@Override
+	public void partOpened(IWorkbenchPart part) { }
+
+	@Override
+	public void setFocus() { }
+}

Property changes on: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/debug/TXMEditorSWTDebugView.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

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 791)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 792)
@@ -1003,4 +1003,8 @@
 	public void setLastComputingParameters(HashMap<String, Object> lastComputingParameters) {
 		this.lastComputingParameters = lastComputingParameters;
 	}
+
+	public Composite getContainer() {
+		return parent;
+	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/GLComposite.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/GLComposite.java	(revision 791)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/GLComposite.java	(revision 792)
@@ -16,10 +16,7 @@
 
 	public GLComposite(Composite parent, int style) {
 		super(parent, style);
-		gl = new GridLayout();
-		gl.marginBottom = 0;gl.marginHeight = 0;gl.marginWidth = 0;gl.marginTop = 0;
-		gl.horizontalSpacing = 0;
-		gl.verticalSpacing = 0;
+		gl = createDefaultLayout(1);
 		super.setLayout(gl);
 	}
 
@@ -33,4 +30,13 @@
 	public final void setLayout(Layout layout) {
 		//super.setLayout(layout);
 	}
+
+	public static GridLayout createDefaultLayout(int numColumns) {
+		GridLayout gl = new GridLayout();
+		gl.marginBottom = 0;gl.marginHeight = 0;gl.marginWidth = 0;gl.marginTop = 0;
+		gl.horizontalSpacing = 0;
+		gl.verticalSpacing = 0;
+		gl.numColumns = numColumns;
+		return gl;
+	}
 }
Index: tmp/org.txm.rcp/plugin.xml
===================================================================
--- tmp/org.txm.rcp/plugin.xml	(revision 791)
+++ tmp/org.txm.rcp/plugin.xml	(revision 792)
@@ -184,6 +184,14 @@
             name="TXMResultDebugView"
             restorable="true">
       </view>
+      <view
+            category="org.txm.rcp"
+            class="org.txm.rcp.views.debug.TXMEditorSWTDebugView"
+            icon="platform:/plugin/org.txm.core/res/org/txm/images/icons/help.png"
+            id="org.txm.rcp.views.debug.TXMEditorSWTDebugView"
+            name="SWT debug view"
+            restorable="true">
+      </view>
    </extension>
    <extension
          point="org.eclipse.core.runtime.adapters">
Index: tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/MessagesMP.java
===================================================================
--- tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/MessagesMP.java	(revision 791)
+++ tmp/org.txm.backtomedia.rcp/src/vlcplayerrcp/MessagesMP.java	(revision 792)
@@ -5,10 +5,6 @@
 
 public class MessagesMP extends NLS {
 	
-	
-	private static final String BUNDLE_NAME = "vlcplayerrcp.messages"; //$NON-NLS-1$
-
-	
 	public static String BackToMedia_0;
 	public static String BackToMedia_1;
 	public static String BackToMedia_11;
@@ -52,7 +48,7 @@
 	
 	
 	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, MessagesMP.class);
+		Utf8NLS.initializeMessages(MessagesMP.class);
 	}
 
 }
Index: tmp/org.txm.xmleditor.rcp/src/xmleditorrcp/XMLEditorMessages.java
===================================================================
--- tmp/org.txm.xmleditor.rcp/src/xmleditorrcp/XMLEditorMessages.java	(revision 791)
+++ tmp/org.txm.xmleditor.rcp/src/xmleditorrcp/XMLEditorMessages.java	(revision 792)
@@ -1,15 +1,17 @@
 package xmleditorrcp;
 
 import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
 
 public class XMLEditorMessages extends NLS {
-	private static final String BUNDLE_NAME = "xmleditorrcp.messages"; //$NON-NLS-1$
+
 	public static String OpenXMLEditor_1;
 	public static String OpenXMLEditor_3;
 	public static String OpenXMLEditor_4;
+	
 	static {
 		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, XMLEditorMessages.class);
+		Utf8NLS.initializeMessages(XMLEditorMessages.class);
 	}
 
 	private XMLEditorMessages() {
Index: tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java	(revision 791)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java	(revision 792)
@@ -5,13 +5,9 @@
 
 public class IndexCoreMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.index.core.messages.messages"; //$NON-NLS-1$
-
-	
 	public static String DetailsFromPartition;
 	public static String DetailsFromCorpus;
 	
-	
 	public static String RESULT_TYPE;
 	public static String Index_1;
 	public static String Index_7;
@@ -22,15 +18,13 @@
 	public static String LexiconDetailsFromPartition;
 	public static String LexiconDetailsFromCorpus;
 
-
-	
 	//FIXME unused key
 	public static String Index_0;
 	//end of fixme
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, IndexCoreMessages.class);
+		Utf8NLS.initializeMessages(IndexCoreMessages.class);
 	}
 
 	private IndexCoreMessages() {
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/CQPUIMessages.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/CQPUIMessages.java	(revision 791)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/CQPUIMessages.java	(revision 792)
@@ -12,8 +12,6 @@
  */
 public class CQPUIMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.searchengine.cqp.rcp.messages.messages"; //$NON-NLS-1$
-	
 	public static String CQPPreferencePage_0;
 	public static String CQPPreferencePage_1;
 	public static String CQPPreferencePage_10;
@@ -25,9 +23,8 @@
 	public static String CQPPreferencePage_17;
 	public static String CQPPreferencePage_18;
 	
-	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CQPUIMessages.class);
+		Utf8NLS.initializeMessages(CQPUIMessages.class);
 	}
 }
Index: tmp/org.txm.synopticeditor.rcp/src/org/txm/synopticedition/rcp/messages/SynopticEditionUIMessages.java
===================================================================
--- tmp/org.txm.synopticeditor.rcp/src/org/txm/synopticedition/rcp/messages/SynopticEditionUIMessages.java	(revision 791)
+++ tmp/org.txm.synopticeditor.rcp/src/org/txm/synopticedition/rcp/messages/SynopticEditionUIMessages.java	(revision 792)
@@ -5,8 +5,6 @@
 
 public class SynopticEditionUIMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.synopticedition.rcp.messages.messages"; //$NON-NLS-1$
-	
 	public static String BackToText_0;
 	public static String BackToText_1;
 	public static String BackToText_2;
@@ -40,10 +38,9 @@
 	public static String SynopticEditionEditor_8;
 	public static String SynopticEditionEditor_9;
 	
-	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, SynopticEditionUIMessages.class);
+		Utf8NLS.initializeMessages(SynopticEditionUIMessages.class);
 	}
 
 	private SynopticEditionUIMessages() {
Index: tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/StatsEngineCoreMessages.java
===================================================================
--- tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/StatsEngineCoreMessages.java	(revision 791)
+++ tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/StatsEngineCoreMessages.java	(revision 792)
@@ -5,9 +5,6 @@
 
 public class StatsEngineCoreMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.statsengine.core.messages.messages"; //$NON-NLS-1$
-
-	
 	public static String VectorizeArray_0;
 	public static String VectorizeArray_1;
 	public static String VectorizeArray_10;
@@ -49,10 +46,9 @@
 	public static String QuantitativeDataStructureImpl_1;
 	public static String QuantitativeDataStructureImpl_2;
 
-	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, StatsEngineCoreMessages.class);
+		Utf8NLS.initializeMessages(StatsEngineCoreMessages.class);
 	}
 
 	private StatsEngineCoreMessages() {
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 791)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java	(revision 792)
@@ -5,8 +5,6 @@
 
 public class LexicalTableUIMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.lexicaltable.rcp.messages.messages"; //$NON-NLS-1$
-
 	public static String LexicalTableEditor_1;
 	public static String LexicalTableEditor_10;
 	public static String LexicalTableEditor_11;
@@ -33,6 +31,6 @@
 
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, LexicalTableUIMessages.class);
+		Utf8NLS.initializeMessages(LexicalTableUIMessages.class);
 	}
 }
Index: tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/InternalViewUIMessages.java
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/InternalViewUIMessages.java	(revision 791)
+++ tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/InternalViewUIMessages.java	(revision 792)
@@ -5,8 +5,6 @@
 
 public class InternalViewUIMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.internalview.rcp.messages.messages"; //$NON-NLS-1$
-	
 	public static String ComputeInternalView_0;
 	public static String ComputeInternalView_1;
 	
@@ -22,6 +20,6 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, InternalViewUIMessages.class);
+		Utf8NLS.initializeMessages(InternalViewUIMessages.class);
 	}
 }
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java	(revision 791)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java	(revision 792)
@@ -13,16 +13,12 @@
  */
 public class AnnotationUIMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.annotation.rcp.messages.messages"; //$NON-NLS-1$
-
 	public static String AnnotationPreferences_1;
 	public static String AnnotationPreferences_2;
 
-	
-
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, AnnotationUIMessages.class);
+		Utf8NLS.initializeMessages(AnnotationUIMessages.class);
 	}
 
 	private AnnotationUIMessages() {
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/messages/PartitionCoreMessages.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/messages/PartitionCoreMessages.java	(revision 791)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/messages/PartitionCoreMessages.java	(revision 792)
@@ -13,8 +13,6 @@
  */
 public class PartitionCoreMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.partition.core.messages.messages"; //$NON-NLS-1$
-
 	public static String CHARTSENGINE_CANT_CREATE_PARTITION_DIMENSIONS_FILE_CHART;
 	public static String CHARTSENGINE_PARTITION_DIMENSIONS_SORTED_BY_SIZE;
 	public static String CHARTSENGINE_PARTITION_DIMENSIONS_DIMENSIONS_OF_PARTITION;
@@ -26,7 +24,7 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, PartitionCoreMessages.class);
+		Utf8NLS.initializeMessages(PartitionCoreMessages.class);
 	}
 
 	private PartitionCoreMessages() {
Index: tmp/org.txm.annotation.core/src/org/txm/annotation/core/KRAnnotationEngine.java
===================================================================
--- tmp/org.txm.annotation.core/src/org/txm/annotation/core/KRAnnotationEngine.java	(revision 791)
+++ tmp/org.txm.annotation.core/src/org/txm/annotation/core/KRAnnotationEngine.java	(revision 792)
@@ -196,6 +196,8 @@
 		for (int i = 0 ; i < repositoriesList.getLength() ; i++) {
 			names.add(((Element)repositoriesList.item(i)).getAttribute("name"));
 		}
+		
+		if (names.size() == 0) names.add(params.getCorpusName()); // add default KR = properties & structure properties
 		return names;
 	}
 	
Index: tmp/org.txm.annotation.core/src/org/txm/annotation/core/repository/Messages.java
===================================================================
--- tmp/org.txm.annotation.core/src/org/txm/annotation/core/repository/Messages.java	(revision 791)
+++ tmp/org.txm.annotation.core/src/org/txm/annotation/core/repository/Messages.java	(revision 792)
@@ -4,12 +4,8 @@
 
 public class Messages extends Utf8NLS {
 	
-	
-	private static final String BUNDLE_NAME = "org.txm.annotation.core.repository.messages.messages"; //$NON-NLS-1$
-	
-	
 	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		Utf8NLS.initializeMessages(Messages.class);
 	}
 
 	private Messages() {
Index: tmp/org.txm.annotation.core/src/org/txm/annotation/core/repository/KnowledgeRepositoryManager.java
===================================================================
--- tmp/org.txm.annotation.core/src/org/txm/annotation/core/repository/KnowledgeRepositoryManager.java	(revision 791)
+++ tmp/org.txm.annotation.core/src/org/txm/annotation/core/repository/KnowledgeRepositoryManager.java	(revision 792)
@@ -1,6 +1,7 @@
 package org.txm.annotation.core.repository;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -12,6 +13,7 @@
 import org.txm.annotation.core.KRAnnotationEngine;
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.objects.BaseParameters;
+import org.txm.searchengine.cqp.corpus.MainCorpus;
 import org.txm.sql.SQLConnection;
 import org.txm.utils.logger.Log;
 import org.txm.utils.xml.DomUtils;
@@ -23,12 +25,12 @@
 	//private static KnowledgeRepositoryManager INSTANCE = null;
 	private static HashMap<String, KnowledgeRepository> repositories = new HashMap<String, KnowledgeRepository>();
 
-//	public static KnowledgeRepositoryManager getInstance(){
-//		if (INSTANCE == null) {
-//			INSTANCE = new KnowledgeRepositoryManager();
-//		}
-//		return INSTANCE;
-//	}
+	//	public static KnowledgeRepositoryManager getInstance(){
+	//		if (INSTANCE == null) {
+	//			INSTANCE = new KnowledgeRepositoryManager();
+	//		}
+	//		return INSTANCE;
+	//	}
 
 	/**
 	 * Lazy load KR.
@@ -42,7 +44,7 @@
 		HashMap<String, HashMap<String, ?>> conf = KRAnnotationEngine.getKnowledgeRepositoryConfiguration(name, element);
 		return createKnowledgeRepository(name, conf);
 	}
-	
+
 	/**
 	 * Lazy load KR.
 	 * 
@@ -59,7 +61,7 @@
 		HashMap<String, HashMap<String, String>> fields = (HashMap<String, HashMap<String, String>>) conf.get(KRAnnotationEngine.KNOWLEDGE_TYPES);
 		HashMap<String, HashMap<String, String>> strings = (HashMap<String, HashMap<String, String>>) conf.get(KRAnnotationEngine.KNOWLEDGE_STRINGS);
 		String access_type = access.get("mode");
-		
+
 		KnowledgeRepository kr = null;
 		if (!access_type.equals(DatabasePersistenceManager.ACCESS_SQL) 
 				&& !access_type.equals(DatabasePersistenceManager.ACCESS_FILE)) {
@@ -67,7 +69,7 @@
 			access.put("mode", "file");
 			access_type = "file";
 		}
-		
+
 		if (access_type.equals(DatabasePersistenceManager.ACCESS_SQL)) {
 			kr = new SQLKnowledgeRepository(name);
 			kr.setCredencialsNeeded("true".equals(access.get(SQLConnection.SQL_USER)), "true".equals(access.get(SQLConnection.SQL_PASSWORD)));
@@ -76,7 +78,7 @@
 		} else {
 			System.out.println("Unknowned repository type: "+access_type);
 		}
-		
+
 		if (kr != null) {
 			//System.out.println("------- KnowledgeRepositoryManager : KR is been created "+kr.getName()+"--------");
 			kr.setAccessProperties(access);
@@ -88,10 +90,10 @@
 		} else {
 			System.out.println("Error. KR not created.");
 		}
-		
+
 		return kr;
 	}
-	
+
 	/**
 	 * get all KR stored
 	 * 
@@ -100,7 +102,7 @@
 	public static KnowledgeRepository[] getKnowledgeRepositories(){
 		return repositories.values().toArray(new KnowledgeRepository[repositories.size()]);
 	}
-	
+
 	public static KnowledgeRepository getKnowledgeRepository(String name) {
 		KnowledgeRepository kr = null;
 		File krconf = new File(Toolbox.getTXMHOMEPATH(),"repositories/"+name+"/conf.xml");
@@ -127,12 +129,15 @@
 	 * @param name
 	 * @return
 	 */
-	public static KnowledgeRepository getKnowledgeRepository(String name, org.txm.objects.Corpus corpus) {
+	public static KnowledgeRepository getKnowledgeRepository(String name, MainCorpus corpus) {
 		KnowledgeRepository kr = null;
+
 		File krconf = new File(Toolbox.getTXMHOMEPATH(),"repositories/"+name+"/conf.xml");
+		
 		if (repositories.containsKey(name)) {
 			kr = repositories.get(name);
 		} else {
+			
 			if (krconf.exists()) {
 				try {
 					kr = createKnowledgeRepository(name, DomUtils.load(krconf).getDocumentElement());
@@ -148,24 +153,24 @@
 				}
 			}
 		}
-		
+
 		Element krCorpusElement = KRAnnotationEngine.getKnowledgeRepositoryElement(corpus.getBase().getBaseParameters(), name);
 		String sKRCorpusVersion = krCorpusElement.getAttribute("version");
-		
+
 		if (kr != null) {
 			int version = kr.getVersion();
-			
+
 			int krCorpusVersion = 0;
 			if (sKRCorpusVersion.length() > 0)
 				krCorpusVersion = Integer.parseInt(sKRCorpusVersion);
-				//System.out.println("Versions KR : "+version+" >= "+krCorpusVersion);
+			//System.out.println("Versions KR : "+version+" >= "+krCorpusVersion);
 			if (version >= krCorpusVersion) { // version is more recent
 				return kr;
 			} else {
 				// replace the KR
 				System.out.println("REPLACE OLD KR="+kr+" (version="+version+") WITH corpus KR configuration (version="+krCorpusVersion+")");
 				KnowledgeRepository krNew = createKnowledgeRepository(name, krCorpusElement);
-				
+
 				try {
 					krconf.getParentFile().mkdirs();
 					DomUtils.save(krCorpusElement, krconf);
@@ -200,16 +205,16 @@
 				System.out.println("Internal error: the new KR is null: "+name);
 			}
 		}
-		
+
 		return kr;
 	}
 
 	public static boolean[] mustLoginToKnowledgeRepository(String kr_name,
-			org.txm.objects.Corpus corpus) {
+			MainCorpus corpus) {
 
 		KnowledgeRepository kr = getKnowledgeRepository(kr_name, corpus);
 		if (kr == null) return KnowledgeRepository.FALSES;
-		
+
 		return kr.mustLoginToKnowledgeRepository();
 	}
 
@@ -217,15 +222,15 @@
 		String html = "<html><head><title$title</title></head><body>$body</body></html>";
 		return html;
 	}
-	
+
 	public static String generateLocalURLPage(String krname, String name, String id) {
-	
+
 		KnowledgeRepository kr = getKnowledgeRepository(krname);
 		String path = Toolbox.getTXMHOMEPATH()+"/repositories/"+krname;
 		//File htmlTemplateFile = new File(path+"/template.html");
 		File newHtmlFile = null;
 		String htmlString;
-		
+
 		if(kr != null){
 			AnnotationType t = kr.getType(id);
 			try {
@@ -235,12 +240,12 @@
 				String body = "<p>Name : "+name + "("+id+")</p>";
 				if(t!=null){
 					List<TypedValue> values =  kr.getValues(t);
-					
+
 					body += "<p>Values : </p>";
 					for(TypedValue value : values){
 						body += "<p>"+value.toHumanString()+"</p>";
 					}
-					
+
 				}				
 				htmlString = htmlString.replace("$title", title);
 				htmlString = htmlString.replace("$body", body);
@@ -250,11 +255,11 @@
 				System.out.println("Generating HTML Page failed for "+id+" : "+e);
 				Log.printStackTrace(e);
 			}
-			
+
 		}else {
 			System.out.println("KR "+krname+" is null !");
 		}
-		
+
 		return newHtmlFile.getAbsolutePath();
 	}
 
@@ -263,11 +268,11 @@
 		List<AnnotationType> annotTypes = kr.getAllAnnotationTypes();
 		for(AnnotationType annotType : annotTypes)
 			kr.deleteType(annotType);
-		
+
 		repositories.remove(kr);
 	}
 
-	
 
-	
+
+
 }
Index: tmp/org.txm.annotation.core/src/org/txm/annotation/core/repository/KnowledgeRepository.java
===================================================================
--- tmp/org.txm.annotation.core/src/org/txm/annotation/core/repository/KnowledgeRepository.java	(revision 791)
+++ tmp/org.txm.annotation.core/src/org/txm/annotation/core/repository/KnowledgeRepository.java	(revision 792)
@@ -297,7 +297,7 @@
 
 	private void buildTypes(){
 		//System.out.println("KR build types ... : "+fieldsTypesProperties.size());
-		if (fieldsTypesProperties.size() != 0) {
+		if (fieldsTypesProperties != null && fieldsTypesProperties.size() != 0) {
 		 	for (String type : fieldsTypesProperties.keySet()) {
 				HashMap<String, String> typeFieldsContent = fieldsTypesProperties.get(type);
 		
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/SpecificitiesUIMessages.java
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/SpecificitiesUIMessages.java	(revision 791)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/SpecificitiesUIMessages.java	(revision 792)
@@ -5,10 +5,6 @@
 
 public class SpecificitiesUIMessages extends NLS {
 	
-
-	private static final String BUNDLE_NAME = "org.txm.specificities.rcp.messages.messages"; //$NON-NLS-1$
-	
-	
 	public static String SpecificitiesPreferencePage_2;
 	public static String SpecificitiesPreferencePage_3;
 	public static String SpecificitiesPreferencePage_4;
@@ -19,11 +15,10 @@
 	public static String SpecificitiesPreferencePage_8;
 	public static String SpecificitiesTableEditor_0;
 	public static String SpecificitiesTableEditor_11;
-
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, SpecificitiesUIMessages.class);
+		Utf8NLS.initializeMessages(SpecificitiesUIMessages.class);
 	}
 
 	private SpecificitiesUIMessages() {
Index: tmp/org.txm.analec.rcp/src/org/txm/analec/widgets/Messages.java
===================================================================
--- tmp/org.txm.analec.rcp/src/org/txm/analec/widgets/Messages.java	(revision 791)
+++ tmp/org.txm.analec.rcp/src/org/txm/analec/widgets/Messages.java	(revision 792)
@@ -1,17 +1,19 @@
 package org.txm.analec.widgets;
 
 import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.txm.analec.widgets.messages"; //$NON-NLS-1$
+	
 	public static String NavigationField_0;
 	public static String NavigationField_2;
 	public static String NavigationField_3;
 	public static String NavigationField_4;
 	public static String NavigationField_5;
+	
 	static {
 		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		Utf8NLS.initializeMessages(Messages.class);
 	}
 
 	private Messages() {
Index: tmp/org.txm.analec.rcp/src/org/txm/analec/Messages.java
===================================================================
--- tmp/org.txm.analec.rcp/src/org/txm/analec/Messages.java	(revision 791)
+++ tmp/org.txm.analec.rcp/src/org/txm/analec/Messages.java	(revision 792)
@@ -1,14 +1,16 @@
 package org.txm.analec;
 
 import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.txm.analec.messages"; //$NON-NLS-1$
+
 	public static String AnalecCorpora_3;
 	public static String AnalecCorpora_4;
+	
 	static {
 		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		Utf8NLS.initializeMessages(Messages.class);
 	}
 
 	private Messages() {
Index: tmp/org.txm.analec.rcp/src/org/txm/analec/toolbarbutton/Messages.java
===================================================================
--- tmp/org.txm.analec.rcp/src/org/txm/analec/toolbarbutton/Messages.java	(revision 791)
+++ tmp/org.txm.analec.rcp/src/org/txm/analec/toolbarbutton/Messages.java	(revision 792)
@@ -1,9 +1,10 @@
 package org.txm.analec.toolbarbutton;
 
 import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.txm.analec.toolbarbutton.messages"; //$NON-NLS-1$
+
 	public static String StartButton_0;
 	public static String StartButton_1;
 	public static String StartButton_10;
@@ -17,9 +18,10 @@
 	public static String StartButton_7;
 	public static String StartButton_8;
 	public static String StartButton_9;
+	
 	static {
 		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		Utf8NLS.initializeMessages(Messages.class);
 	}
 
 	private Messages() {
Index: tmp/org.txm.analec.rcp/src/org/txm/analec/toolbar/Messages.java
===================================================================
--- tmp/org.txm.analec.rcp/src/org/txm/analec/toolbar/Messages.java	(revision 791)
+++ tmp/org.txm.analec.rcp/src/org/txm/analec/toolbar/Messages.java	(revision 792)
@@ -1,9 +1,10 @@
 package org.txm.analec.toolbar;
 
 import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
 
 public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.txm.analec.toolbar.messages"; //$NON-NLS-1$
+
 	public static String AnnotationToolbar_0;
 	public static String AnnotationToolbar_6;
 	public static String AnnotationToolbar_7;
@@ -37,9 +38,10 @@
 	public static String UnitToolbar_63;
 	public static String UnitToolbar_7;
 	public static String UnitToolbar_8;
+	
 	static {
 		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+		Utf8NLS.initializeMessages(Messages.class);
 	}
 
 	private Messages() {
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 791)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/ReferencerCoreMessages.java	(revision 792)
@@ -12,17 +12,12 @@
  */
 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);
+		Utf8NLS.initializeMessages(ReferencerCoreMessages.class);
 	}
 	
 	
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java	(revision 791)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java	(revision 792)
@@ -12,8 +12,6 @@
  */
 public class RCoreMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.statsengine.r.core.messages.messages"; //$NON-NLS-1$
-
 	public static String error_cantFindRServeInPath;
 	public static String error_connectionFailed;
 	public static String error_errorDuringItemsListExtraction;
@@ -50,7 +48,7 @@
 
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, RCoreMessages.class);
+		Utf8NLS.initializeMessages(RCoreMessages.class);
 	}
 
 	private RCoreMessages() {
Index: tmp/org.txm.groovy.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 791)
+++ tmp/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 792)
@@ -20,7 +20,7 @@
  org.txm.core;bundle-version="0.7.0",
  org.txm.index.core;bundle-version="1.0.0",
  org.txm.lexicaltable.core;bundle-version="1.0.0",
-  org.txm.libs.batik;bundle-version="0.0.0",
+ org.txm.libs.batik;bundle-version="0.0.0",
  org.txm.libs.colt;bundle-version="1.2.0",
  org.txm.libs.itext;bundle-version="2.1.5",
  org.txm.libs.jfreechart;bundle-version="1.0.17",
@@ -35,7 +35,7 @@
  org.txm.libs.cqp;bundle-version="1.0.0",
  org.txm.searchengine.core;bundle-version="1.0.0",
  org.eclipse.swt;bundle-version="3.103.2",
- org.txm.information.core;bundle-version="1.0.0"
+ org.txm.properties.core;bundle-version="1.0.0"
 Export-Package: .,
  filters.BuildXmlLiturgie,
  filters.Concatenator,
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/test/CQPBenchmark.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/test/CQPBenchmark.groovy	(revision 791)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/test/CQPBenchmark.groovy	(revision 792)
@@ -104,7 +104,7 @@
 	// INFORMATIONS
 	print " INFO"
 	time = System.currentTimeMillis();
-	def diag = new Information(corpus, 20)
+	def diag = new Properties(corpus, 20)
 	diag.stepGeneralInfos();
 	diag.stepLexicalProperties();
 	diag.stepStructuralUnits();
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/test/Informations.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/test/Informations.groovy	(revision 791)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/test/Informations.groovy	(revision 792)
@@ -35,7 +35,7 @@
 
 // imports des fonctions que l'on va utiliser
 import org.txm.Toolbox
-import org.txm.information.core.functions.Information
+import org.txm.properties.core.functions.Properties
 import org.txm.searchengine.cqp.corpus.*
 import org.txm.objects.*
 
@@ -54,7 +54,7 @@
 
 try
 {
-	def d = new Information(corpus, 20)
+	def d = new Properties(corpus, 20)
 	d.process();
 	println d.htmlDump()
 } catch(Exception e){	e.printStackTrace() }
Index: tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/WordCloudUIMessages.java
===================================================================
--- tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/WordCloudUIMessages.java	(revision 791)
+++ tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/WordCloudUIMessages.java	(revision 792)
@@ -5,9 +5,6 @@
 
 public class WordCloudUIMessages extends NLS {
 	
-
-	private static final String BUNDLE_NAME = "org.txm.wordcloud.rcp.messages.messages"; //$NON-NLS-1$
-	
 	public static String EditorToolBar_vmax;
 	public static String EditorToolBar_fmin;
 	public static String EditorToolBar_Percent_of_rotated_labels;
@@ -29,7 +26,7 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, WordCloudUIMessages.class);
+		Utf8NLS.initializeMessages(WordCloudUIMessages.class);
 	}
 
 	private WordCloudUIMessages() {
Index: tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/WordCloudCoreMessages.java
===================================================================
--- tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/WordCloudCoreMessages.java	(revision 791)
+++ tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/WordCloudCoreMessages.java	(revision 792)
@@ -1,11 +1,10 @@
 package org.txm.wordcloud.core.messages;
 
 import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
 
 public class WordCloudCoreMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.wordcloud.core.messages.messages"; //$NON-NLS-1$
-
 	public static String RESULT_TYPE;
 	
 	public static String Log_Aborting;
@@ -18,7 +17,7 @@
 
 	static {
 		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, WordCloudCoreMessages.class);
+		Utf8NLS.initializeMessages(WordCloudCoreMessages.class);
 	}
 
 	private WordCloudCoreMessages() {
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/PartitionUIMessages.java
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/PartitionUIMessages.java	(revision 791)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/PartitionUIMessages.java	(revision 792)
@@ -11,15 +11,12 @@
  */
 public class PartitionUIMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.partition.rcp.messages.messages"; //$NON-NLS-1$
-
 	public static String PreferencesPage_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE;
 	public static String PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE;
 	
-
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, PartitionUIMessages.class);
+		Utf8NLS.initializeMessages(PartitionUIMessages.class);
 	}
 
 	private PartitionUIMessages() {
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/CooccurrenceUIMessages.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/CooccurrenceUIMessages.java	(revision 791)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/CooccurrenceUIMessages.java	(revision 792)
@@ -5,9 +5,6 @@
 
 public class CooccurrenceUIMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.cooccurrence.rcp.messages.messages"; //$NON-NLS-1$
-	
-	
 	public static String CoocPreferencePage_0;
 	public static String CoocPreferencePage_1;
 	public static String CoocPreferencePage_11;
@@ -46,10 +43,9 @@
 	public static String CooccurrencesEditor_11;
 	// end of fixme
 
-	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CooccurrenceUIMessages.class);
+		Utf8NLS.initializeMessages(CooccurrenceUIMessages.class);
 	}
 
 	private CooccurrenceUIMessages() {
Index: tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/InternalViewCoreMessages.java
===================================================================
--- tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/InternalViewCoreMessages.java	(revision 791)
+++ tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/InternalViewCoreMessages.java	(revision 792)
@@ -12,13 +12,11 @@
  */
 public class InternalViewCoreMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.internalview.core.messages.messages"; //$NON-NLS-1$
-	
 	public static String InternalView_3;
 	public static String InternalView_6;
 	public static String InternalView_7;
 	
 	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, InternalViewCoreMessages.class);
+		Utf8NLS.initializeMessages(InternalViewCoreMessages.class);
 	}
 }
Index: tmp/org.txm.utils/src/org/txm/utils/messages/UtilsCoreMessages.java
===================================================================
--- tmp/org.txm.utils/src/org/txm/utils/messages/UtilsCoreMessages.java	(revision 791)
+++ tmp/org.txm.utils/src/org/txm/utils/messages/UtilsCoreMessages.java	(revision 792)
@@ -11,8 +11,6 @@
  */
 public class UtilsCoreMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.utils.messages.messages"; //$NON-NLS-1$
-	
 	public static String ExecTimer_0;
 	public static String ExecTimer_1;
 	public static String ExecTimer_2;
@@ -33,15 +31,9 @@
 	public static String Pair_0;
 	public static String Pair_1;
 	public static String Sh_4;
-
 	
-	
-	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, UtilsCoreMessages.class);
+		Utf8NLS.initializeMessages(UtilsCoreMessages.class);
 	}
-	
-	
-	
 }
Index: tmp/org.txm.utils/src/org/txm/utils/messages/Utf8NLS.java
===================================================================
--- tmp/org.txm.utils/src/org/txm/utils/messages/Utf8NLS.java	(revision 791)
+++ tmp/org.txm.utils/src/org/txm/utils/messages/Utf8NLS.java	(revision 792)
@@ -4,6 +4,7 @@
 import java.lang.reflect.Modifier;
 
 import org.eclipse.osgi.util.NLS;
+import org.txm.utils.logger.Log;
 
 
 /**
@@ -17,8 +18,14 @@
 	private static final int MOD_EXPECTED = Modifier.PUBLIC | Modifier.STATIC;
 	private static final int MOD_MASK = MOD_EXPECTED | Modifier.FINAL;
 
+	/**
+	 *  initialize UTF-8 messages using the Message class package path as base name
+	 * @param clazz
+	 */
+	public static void initializeMessages(Class<?> clazz) {
+		initializeMessages(clazz.getPackage().getName()+".messages", clazz);
+	}
 	
-	
 	/**
 	 * Initializes messages using UTF-8 encoding.
 	 * @param baseName
Index: tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/CooccurrenceCoreMessages.java
===================================================================
--- tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/CooccurrenceCoreMessages.java	(revision 791)
+++ tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/CooccurrenceCoreMessages.java	(revision 792)
@@ -5,8 +5,6 @@
 
 public class CooccurrenceCoreMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.cooccurrence.core.messages.messages"; //$NON-NLS-1$
-	
 	public static String Cooccurrence_10;
 	public static String Cooccurrence_102;
 	public static String Cooccurrence_103;
@@ -32,6 +30,6 @@
 	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CooccurrenceCoreMessages.class);
+		Utf8NLS.initializeMessages(CooccurrenceCoreMessages.class);
 	}
 }
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java	(revision 791)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java	(revision 792)
@@ -11,10 +11,6 @@
  */
 public class CAUIMessages extends Utf8NLS {
 	
-	
-	private static final String BUNDLE_NAME = "org.txm.ca.rcp.messages.messages"; //$NON-NLS-1$
-	
-	
 	public static String PreferencePage_0;
 	public static String PreferencePage_1;
 	public static String PreferencePage_2;
@@ -65,7 +61,7 @@
 
 	
 	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CAUIMessages.class);
+		Utf8NLS.initializeMessages(CAUIMessages.class);
 	}
 
 }
Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/ParaBrowserUIMessages.java
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/ParaBrowserUIMessages.java	(revision 791)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/ParaBrowserUIMessages.java	(revision 792)
@@ -13,8 +13,6 @@
  */
 public class ParaBrowserUIMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.para.rcp.messages.messages"; //$NON-NLS-1$
-
 	public static String ParaBrowserEditor_11;
 	public static String ParaBrowserEditor_18;
 	public static String ParaBrowserEditor_19;
@@ -29,7 +27,7 @@
 
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, ParaBrowserUIMessages.class);
+		Utf8NLS.initializeMessages(ParaBrowserUIMessages.class);
 	}
 
 	private ParaBrowserUIMessages() {
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/SpecificitiesCoreMessages.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/SpecificitiesCoreMessages.java	(revision 791)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/SpecificitiesCoreMessages.java	(revision 792)
@@ -12,8 +12,6 @@
  */
 public class SpecificitiesCoreMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.txm.specificities.core.messages.messages"; //$NON-NLS-1$
-
 	public static String ChartsError_CANT_CREATE_SPECIFICITIES_FILE_CHART;
 	
 	public static String Charts_X_AXIS_LABEL;
@@ -35,10 +33,9 @@
 
 	public static String error_errorWhileComputingSpecificities;
 
-	
 	static {
 		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, SpecificitiesCoreMessages.class);
+		Utf8NLS.initializeMessages(SpecificitiesCoreMessages.class);
 	}
 
 }
Index: tmp/org.txm.information.core/.project
===================================================================
--- tmp/org.txm.information.core/.project	(revision 791)
+++ tmp/org.txm.information.core/.project	(revision 792)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.txm.information.core</name>
+	<name>org.txm.properties.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
Index: tmp/org.txm.information.core/src/org/txm/properties/core/messages/messages.properties
===================================================================
--- tmp/org.txm.information.core/src/org/txm/properties/core/messages/messages.properties	(revision 0)
+++ tmp/org.txm.information.core/src/org/txm/properties/core/messages/messages.properties	(revision 792)
@@ -0,0 +1,20 @@
+
+Properties_0  = * Structural Units properties\n
+Properties_1  = ** Failed to access corpus 
+Properties_11 = \ structures
+Properties_14 = Lexical Units properties (max {0} values)
+Properties_16 = Number of structural units 
+Properties_2  = ** Error
+Properties_22 = Structural Units properties (max {0} values)
+Properties_26 = No property
+Properties_3  = Description of 
+Properties_4  = \ properties
+Properties_40 = * General Statistics\n
+Properties_41 = - T 
+Properties_43 = - Word properties 
+Properties_49 = - S 
+Properties_5  = General Statistics
+Properties_6  = ** Failed to access corpus 
+Properties_7  = Number of words 
+Properties_8  = \ lexicon
+Properties_9  = Number of word properties 

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

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

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

Index: tmp/org.txm.information.core/src/org/txm/properties/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.information.core/src/org/txm/properties/core/messages/messages_fr.properties	(revision 0)
+++ tmp/org.txm.information.core/src/org/txm/properties/core/messages/messages_fr.properties	(revision 792)
@@ -0,0 +1,20 @@
+
+Properties_0  = <h3>Propriétés des structures\n
+Properties_1  = ** Echec d'accès au corpus
+Properties_11 = \ structures
+Properties_14 = Propriétés des unités lexicales (max {0} valeurs)
+Properties_16 = Nombre d'unités de structure 
+Properties_2  = ** Erreur
+Properties_22 = Propriétés des structures (max {0} valeurs)
+Properties_26 = Pas de propriété
+Properties_3  = Description du corpus 
+Properties_4  = \ propriétés
+Properties_40 = * Statistiques Générales\n
+Properties_41 = - T
+Properties_43 = - Propriétés de mot 
+Properties_49 = - S
+Properties_5  = Statistiques Générales
+Properties_6  = ** Echec d'accès au corpus
+Properties_7  = Nombre de mots 
+Properties_8  = \ lexique
+Properties_9  = Nombre de propriétés de mot 

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

Index: tmp/org.txm.information.core/src/org/txm/properties/core/messages/PropertiesCoreMessages.java
===================================================================
--- tmp/org.txm.information.core/src/org/txm/properties/core/messages/PropertiesCoreMessages.java	(revision 0)
+++ tmp/org.txm.information.core/src/org/txm/properties/core/messages/PropertiesCoreMessages.java	(revision 792)
@@ -0,0 +1,46 @@
+package org.txm.properties.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * Information core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class PropertiesCoreMessages extends NLS {
+
+	public static String Properties_0;
+	public static String Properties_1;
+	public static String Properties_11;
+	public static String Properties_14;
+	public static String Properties_16;
+	public static String Properties_2;
+	public static String Properties_22;
+	public static String Properties_26;
+	public static String Properties_3;
+	public static String Properties_4;
+	public static String Properties_40;
+	public static String Properties_41;
+	public static String Properties_43;
+	public static String Properties_49;
+	public static String Properties_5;
+	public static String Properties_6;
+	public static String Properties_7;
+	public static String Properties_8;
+	public static String Properties_9;
+
+	
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(PropertiesCoreMessages.class);
+	}
+
+	private PropertiesCoreMessages() {
+	}
+	
+}

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

Index: tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java
===================================================================
--- tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java	(revision 0)
+++ tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java	(revision 792)
@@ -0,0 +1,654 @@
+// 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: 2016-09-19 10:31:00 +0200 (Mon, 19 Sep 2016) $
+// $LastChangedRevision: 3298 $
+// $LastChangedBy: mdecorde $ 
+//
+package org.txm.properties.core.functions;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Locale;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.core.preferences.TBXPreferences;
+import org.txm.core.preferences.TXMPreferences;
+import org.txm.core.results.Parameter;
+import org.txm.core.results.TXMParameters;
+import org.txm.core.results.TXMResult;
+import org.txm.objects.Base;
+import org.txm.properties.core.messages.PropertiesCoreMessages;
+import org.txm.properties.core.preferences.PropertiesPreferences;
+import org.txm.searchengine.cqp.AbstractCqiClient;
+import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
+import org.txm.searchengine.cqp.corpus.Corpus;
+import org.txm.searchengine.cqp.corpus.CorpusManager;
+import org.txm.searchengine.cqp.corpus.Property;
+import org.txm.searchengine.cqp.corpus.StructuralUnit;
+import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
+import org.txm.searchengine.cqp.corpus.WordProperty;
+import org.txm.utils.AsciiUtils;
+import org.txm.utils.logger.Log;
+
+/**
+ * Computes a diagnostic of Corpus or Subcorpus.
+ * 
+ * @author mdecorde
+ */
+public class Properties extends TXMResult {
+	// Base base;
+	/** The corpus. */
+	protected Corpus corpus;
+	
+	// Numbers
+	/** The T. */
+	int T = 0; // number of word
+
+	/** The N properties. */
+	int NProperties = 0; // number of word properties
+	//HashMap<String, Integer> propertiesCounts = new HashMap<String, Integer>(); // properties counts
+	/** The properties values. */
+	HashMap<String, List<String>> propertiesValues = new HashMap<String, List<String>>(); // properties values
+
+	/** The N structures. */
+	int NStructures = 0; // number of structures
+	
+	/** The structures counts. */
+	HashMap<String, Integer> structuresCounts = new HashMap<String, Integer>(); // structures counts
+
+	/** The internal architecture. */
+	List<String> internalArchitecture = new ArrayList<String>(); // wtc structures = propertiesCounts keys but ordered
+	
+	/** The hierarchie counts. */
+	HashMap<String, Integer> hierarchieCounts = new HashMap<String, Integer>(); // hierarchic structures counts
+	
+	/** The internal architecture properties. */
+	HashMap<String, HashMap<String, List<String>>> internalArchitectureProperties = new HashMap<String, HashMap<String, List<String>>>(); // hierarchic structures counts
+	
+	/** The internal architecture properties counts. */
+	HashMap<String, HashMap<String, Integer>> internalArchitecturePropertiesCounts = new HashMap<String, HashMap<String, Integer>>(); // hierarchic structures counts
+
+	// Annotations description
+	/** The annotations types. */
+	HashMap<String, Integer> annotationsTypes = new HashMap<String, Integer>(); // for each annotation its description
+	
+	/** The annotations origins. */
+	HashMap<String, Integer> annotationsOrigins = new HashMap<String, Integer>(); // for each annoation its origin description
+
+	/** The properties. */
+	List<WordProperty> properties;
+	
+	/** The structures. */
+	List<StructuralUnit> structures;
+
+	/**
+	 * The HTML file.
+	 */
+	protected File file;
+	
+	/**
+	 * The maximum number of word property values to display.
+	 */
+	@Parameter(key=PropertiesPreferences.MAX_PROPERTIES_TO_DISPLAY)
+	protected int pMaxPropertiesToDisplay;
+	
+	/**
+	 * Instantiates a new Information.
+	 *
+	 * @param corpus a MainCorpus or a SubCorpus
+	 */
+	public Properties(Corpus corpus) {
+		super(corpus);
+		this.corpus = corpus;
+	}
+
+	/**
+	 * Sets the maximum properties to display.
+	 * @param maxPropertiesToDisplay
+	 */
+	public void setParameters(int maxPropertiesToDisplay) {
+		this.pMaxPropertiesToDisplay = maxPropertiesToDisplay;
+		if (this.pMaxPropertiesToDisplay <= 0) {
+			this.pMaxPropertiesToDisplay = 10;
+		}
+		this.dirty = true;
+	}
+	
+	
+	/**
+	 * Step general infos.
+	 */
+	public void stepGeneralInfos()
+	{
+		try {
+			properties = corpus.getProperties();
+			NProperties = properties.size();
+		} catch (CqiClientException e) {
+			Log.severe(PropertiesCoreMessages.Properties_1 + corpus.getName() + PropertiesCoreMessages.Properties_4);
+			Log.printStackTrace(e);
+			return;
+		}
+		
+		try {
+			T = corpus.getSize();// corpus.getLexicon(corpus.getProperty("id")).nbrOfToken();
+		} catch (CqiClientException e) {
+			Log.severe(PropertiesCoreMessages.Properties_6 + corpus.getName() + PropertiesCoreMessages.Properties_8);
+			Log.printStackTrace(e);
+			return;
+		} 
+	}
+	
+	/**
+	 * step2.
+	 * randomly position are choose
+	 */
+	public void stepLexicalProperties() {
+		AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
+		for (Property p : properties) {
+			//int size;
+			try {
+				//size = CorpusManager.getCorpusManager().getCqiClient().lexiconSize(p.getQualifiedName());
+				//propertiesCounts.put(p.getName(), size);
+				//List<String> list = Arrays.asList(corpus.getLexicon(p).getForms(this.maxvalue));
+
+				int[] positions = new int[Math.min(pMaxPropertiesToDisplay, T)];
+				for(int i = 0 ; i < Math.min(pMaxPropertiesToDisplay, T) ; i++) {
+					positions[i] = i;
+				}
+				
+				//ArrayList<String> values = new ArrayList<String>();
+				LinkedHashSet<String> values = new LinkedHashSet<String>(cqiClient.getSingleData(p, positions));
+				propertiesValues.put(p.getName(), new ArrayList<String>(values));
+			} catch (Exception e) {
+				Log.printStackTrace(e);
+			}
+		}
+	}
+	
+	/**
+	 * Step structural units.
+	 */
+	public void stepStructuralUnits()
+	{
+		try {
+			structures = corpus.getOrderedStructuralUnits();
+		} catch (CqiClientException e) {
+			Log.severe(PropertiesCoreMessages.Properties_1 + corpus.getName() + PropertiesCoreMessages.Properties_11);
+			Log.printStackTrace(e);
+			return;
+		}
+		NStructures = structures.size();
+		for (StructuralUnit su : structures) { // for each structural unit
+			internalArchitecture.add(su.getName());
+			hierarchieCounts.put(su.getName(), -1);
+			internalArchitectureProperties.put(su.getName(), new HashMap<String, List<String>>());
+			internalArchitecturePropertiesCounts.put(su.getName(), new HashMap<String, Integer>());
+			
+			if (su.getProperties().size() > 0) {
+				for (StructuralUnitProperty sup : su.getProperties())  {// for each of its property
+					try {
+						List<String> allvalues = sup.getValues(corpus);
+						internalArchitectureProperties.get(su.getName()).put(sup.getName(), allvalues.subList(0, Math.min(allvalues.size(), pMaxPropertiesToDisplay)));
+						internalArchitecturePropertiesCounts.get(su.getName()).put(sup.getName(), allvalues.size());
+					} catch (Exception e) {
+						ArrayList<String> list = new ArrayList<String>(1);
+						list.add(PropertiesCoreMessages.Properties_2);
+						internalArchitectureProperties.get(su.getName()).put(sup.getName(), list);
+						internalArchitecturePropertiesCounts.get(su.getName()).put(sup.getName(), -1);
+					}
+				}
+			}
+		}
+	}
+
+	// FIXME: useless?
+//	/**
+//	 * Instantiates a new diagnostic.
+//	 *
+//	 * @param partition the partition
+//	 * @throws CqiClientException the cqi client exception
+//	 */
+//	public Information(Partition partition) throws CqiClientException {
+//		corpus = partition.getCorpus();
+//		this.partition = partition;
+//		int T = corpus.getSize();
+//		System.out.println(InformationCoreMessages.Properties_12);
+//		int nbParts = partition.getNPart();
+//		List<String> partNames = partition.getPartNames();
+//		List<Integer> partSizes = new ArrayList<Integer>();
+//		List<List<Property>> partProperties = new ArrayList<List<Property>>();
+//		List<String> partQueries = new ArrayList<String>();
+//		for (Part part : partition.getParts()) {
+//			partSizes.add(part.getSize());
+//			partProperties.add(part.getProperties());
+//			partQueries.add(part.getQuery().getQueryString());
+//		}
+//	}
+
+	/**
+	 * dump the results of the diagnostic in a String containing HTML code.
+	 *
+	 * @return the string
+	 */
+	public String htmlDump() {
+		StringBuffer buff = new StringBuffer();
+
+		buff.append("<? version=\"1.0\" encoding=\"UTF-8\"?>\n" + //$NON-NLS-1$
+				"<html>" + //$NON-NLS-1$
+				"<head>" + //$NON-NLS-1$
+				"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>" + //$NON-NLS-1$
+				"</head>" + //$NON-NLS-1$
+				"<body>\n"); //$NON-NLS-1$
+		buff.append("<h2 style'font-family:\"Arial\";'>"+PropertiesCoreMessages.Properties_3 + this.corpus.getName() + "</h2>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+		
+		if (corpus.getDescription() != null && corpus.getDescription().length() > 0) {
+			buff.append("<p>"+corpus.getDescription()+"</p>"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+		
+		buff.append("<h3 style'font-family:\"Arial\";'>"+PropertiesCoreMessages.Properties_5+ "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
+
+		
+		
+		// counts
+		buff.append("<ul>\n"); //$NON-NLS-1$
+		buff.append("<li>" + PropertiesCoreMessages.Properties_7 + T + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
+		buff
+		.append("<li>" + PropertiesCoreMessages.Properties_9 + (NProperties - 1) + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+		buff.append("<li>" + PropertiesCoreMessages.Properties_16 + NStructures + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+		buff.append("</ul>\n"); //$NON-NLS-1$
+
+		// Propriétés d'occurrences
+		buff.append("<h3 style'font-family:\"Arial\";'>"+NLS.bind(PropertiesCoreMessages.Properties_14, pMaxPropertiesToDisplay) + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
+		ArrayList<String> properties = new ArrayList<String>(propertiesValues.keySet());
+		Collections.sort(properties);
+		buff.append("<ul>\n"); //$NON-NLS-1$
+		for (String s : properties) {
+			if (!s.equals("id")) //$NON-NLS-1$
+			{
+				//buff.append("<li> " + s + " (" + propertiesCounts.get(s) + ") : "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				buff.append("<li> " + s + " : "); //$NON-NLS-1$ //$NON-NLS-2$ 
+				for (String v : propertiesValues.get(s))
+					buff.append(v + ", "); //$NON-NLS-1$
+				buff.append("..."); //$NON-NLS-1$
+				buff.append("</li>\n"); //$NON-NLS-1$ 
+			}
+		}
+		buff.append("</ul>\n"); //$NON-NLS-1$
+
+		// Propriété de structures
+		buff.append("<h3 style'font-family:\"Arial\";'>"+NLS.bind(PropertiesCoreMessages.Properties_22, pMaxPropertiesToDisplay)+"</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+		buff.append("<ul>\n"); //$NON-NLS-1$
+		for (String s : internalArchitecture) {
+			StringBuffer subbuffer = new StringBuffer();
+			if (s.equals("txmcorpus")) //$NON-NLS-1$
+				continue;//ignore the txmcorpus structure
+			
+			properties = new ArrayList<String>(internalArchitectureProperties.get(s).keySet());
+			
+			subbuffer.append("<li> " + s + "\n<ul>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+			if (internalArchitectureProperties.get(s).keySet().size() == 0)
+				subbuffer.append("<li>"+PropertiesCoreMessages.Properties_26+"</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$ 
+
+			
+			//System.out.println("struct: "+s+" >> "+properties);
+			Collections.sort(properties);
+			//System.out.println("struct: "+s+" >sort> "+properties);
+			int nbOfValues = 0;
+			for (String ps : properties) {
+				if (!ps.equals("project") && !ps.equals("base") ) //$NON-NLS-1$ //$NON-NLS-2$ 
+				{
+					//System.out.println("struct: "+s+" >> "+ps);
+					int valuecount = internalArchitecturePropertiesCounts.get(s).get(ps);
+					ArrayList<String> values = new ArrayList<String>(internalArchitectureProperties.get(s).get(ps));
+					subbuffer.append("<li> " + ps + " (" + valuecount + ") = "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+					//System.out.println("VALUES: "+values);
+					Collections.sort(values);
+					for (int i = 0 ; i < values.size() ; i++) {
+						nbOfValues++;
+						String psv = values.get(i);
+						if (psv != null && psv.length() > 0)
+							subbuffer.append(psv.replace("<", "&lt;")); //$NON-NLS-1$ //$NON-NLS-2$
+						else
+							subbuffer.append("\"\""); //$NON-NLS-1$
+						
+						if (i == values.size() -1)
+							subbuffer.append("."); //$NON-NLS-1$
+						else
+							subbuffer.append(", "); //$NON-NLS-1$
+						
+						if (i >= pMaxPropertiesToDisplay) {
+							subbuffer.append("..."); //$NON-NLS-1$
+							break;
+						}
+					}
+					subbuffer.append("</li>\n"); //$NON-NLS-1$
+				}
+			}
+			subbuffer.append("</ul>\n</li>\n"); //$NON-NLS-1$
+			if (nbOfValues > 0) {
+				buff.append(subbuffer);
+			}
+		}
+		buff.append("</ul>\n"); //$NON-NLS-1$
+		buff.append("</body>\n"); //$NON-NLS-1$
+		buff.append("</html>\n"); //$NON-NLS-1$
+		
+		return buff.toString();
+	}
+
+	
+	
+	/**
+	 * dump the result in the console.
+	 *
+	 * @param maxvalue the maxvalue
+	 * @return the string
+	 */
+	public String dump(int maxvalue) {
+		StringBuffer buff = new StringBuffer();
+
+		buff.append(PropertiesCoreMessages.Properties_40);
+		buff.append(PropertiesCoreMessages.Properties_41 + String.format(Locale.FRANCE,"%,d", T) + "\n"); //$NON-NLS-1$ 
+		buff.append(PropertiesCoreMessages.Properties_43 + String.format("%,d", NProperties) + "\n"); //$NON-NLS-1$ 
+		/*for (String s : propertiesCounts.keySet())
+			if (!s.equals("id")) //$NON-NLS-1$
+				buff.append(" - " + s + " " + propertiesCounts.get(s) + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				*/
+		buff.append(PropertiesCoreMessages.Properties_49 + String.format("%,d", NStructures) + "\n"); //$NON-NLS-1$ 
+		for (String s : structuresCounts.keySet())
+			buff.append(" - " + s + "\n");//+structuresCounts.get(s)+"\n"); //$NON-NLS-1$ //$NON-NLS-2$
+
+		/*
+		 * buff.append("* Structural Units counts\n"); for(String s :
+		 * internalArchitecture)
+		 * buff.append(" - "+s+" "+hierarchieCounts.get(s)+"\n");
+		 */
+		buff.append(PropertiesCoreMessages.Properties_0);
+		for (String s : internalArchitecture) {
+			buff.append(" - " + s + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
+			for (String ps : internalArchitectureProperties.get(s).keySet()) {
+				if (!(s.equals("text") && (ps.equals("project") || ps.equals("base") || ps.equals("id")))) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+				{
+					buff
+					.append("   - " + ps + "(" + internalArchitectureProperties.get(s).get(ps).size() + ") = "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+					int valuecount = 0;
+					for (String psv : internalArchitectureProperties.get(s)
+							.get(ps)) {
+						buff.append(psv);
+						if (valuecount++ >= maxvalue) {
+							buff.append("..."); //$NON-NLS-1$
+							break;
+						}
+						if (valuecount < internalArchitectureProperties.get(s)
+								.get(ps).size())
+							buff.append(", "); //$NON-NLS-1$
+					}
+
+					buff.append("\n"); //$NON-NLS-1$
+				}
+			}
+		}
+
+		return buff.toString();
+	}
+
+	/**
+	 * dump the result in the console with maxvalue=30.
+	 *
+	 * @return the string
+	 */
+	public String dump() {
+		return dump(30);
+	}
+
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public String getName() {
+		return corpus.getName();
+	}
+
+	/**
+	 * Gets the base.
+	 *
+	 * @return the base
+	 */
+	public Base getBase() {
+		return corpus.getBase();
+	}
+
+	/**
+	 * Gets the t.
+	 *
+	 * @return the t
+	 */
+	public int getT() {
+		return T;
+	}
+
+	/**
+	 * Gets the n properties.
+	 *
+	 * @return the n properties
+	 */
+	public int getNProperties() {
+		return NProperties;
+	}
+
+	/**
+	 * Gets the internal architecture.
+	 *
+	 * @return the internal architecture
+	 */
+	public List<String> getInternalArchitecture() {
+		return internalArchitecture;
+	}
+
+	/**
+	 * Gets the n structures.
+	 *
+	 * @return the n structures
+	 */
+	public int getNStructures() {
+		return NStructures;
+	}
+
+	/**
+	 * Gets the structures counts.
+	 *
+	 * @return the structures counts
+	 */
+	public HashMap<String, Integer> getStructuresCounts() {
+		return structuresCounts;
+	}
+
+	/**
+	 * Gets the annotations types.
+	 *
+	 * @return the annotations types
+	 */
+	public HashMap<String, Integer> getAnnotationsTypes() {
+		return annotationsTypes;
+	}
+
+	/**
+	 * Gets the annotations origins.
+	 *
+	 * @return the annotations origins
+	 */
+	public HashMap<String, Integer> getAnnotationsOrigins() {
+		return annotationsOrigins;
+	}
+
+	/**
+	 * dump the diagnostic in a text file.
+	 *
+	 * @param outfile the outfile
+	 * @param maxvalue the maxvalue
+	 * @return true, if successful
+	 */
+	public boolean toTxt(File outfile, String encoding, int maxvalue) {
+		BufferedWriter writer = null;
+		try {
+			writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outfile),	encoding));
+		} catch (UnsupportedEncodingException e1) {
+			org.txm.utils.logger.Log.printStackTrace(e1);
+			return false;
+		} catch (FileNotFoundException e1) {
+			org.txm.utils.logger.Log.printStackTrace(e1);
+			return false;
+		}
+
+		try {
+			writer.write(this.dump(maxvalue));
+			writer.close();
+		} catch (IOException e) {
+			org.txm.utils.logger.Log.printStackTrace(e);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * dump the diagnostic in a HTML file.
+	 *
+	 * @param outfile the outfile
+	 * @return true, if successful
+	 */
+	public boolean toHTML(File outfile) {
+		OutputStreamWriter writer;
+		try {
+			writer = new OutputStreamWriter(new FileOutputStream(outfile), "UTF-8"); //$NON-NLS-1$
+			writer.write(this.htmlDump());
+			writer.close();
+		} catch (IOException e) {
+			org.txm.utils.logger.Log.printStackTrace(e);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * dump the diagnostic in a text file, maxvalue = 100.
+	 *
+	 * @param outfile the outfile
+	 * @return true, if successful
+	 */
+	public boolean toTxt(File outfile) {
+		return toTxt(outfile, "UTF-8", 100); //$NON-NLS-1$
+	}
+
+	@Override
+	public void clean() {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception {
+		return toTxt(outfile, encoding, 100);
+	}
+
+	@Override
+	public String getSimpleName() {
+		return "Propriétés";
+	}
+
+	@Override
+	public String getDetails() {
+		return "" + T;
+	}
+
+	@Override
+	synchronized protected boolean _compute() throws Exception {
+		
+		this.beginTask("Computing properties...", 3);
+		this.stepGeneralInfos();
+		this.worked(1);
+		
+		this.stepLexicalProperties();
+		this.worked(1);
+		
+		this.stepStructuralUnits();
+		this.worked(1);
+		
+		String txmhome = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE);
+		String filename = corpus.getParent().getName() + "-" + corpus.getName(); //$NON-NLS-1$
+		filename = AsciiUtils.buildId(filename);
+		file = new File(txmhome, "results/" + filename + "-infos.html"); //$NON-NLS-1$ //$NON-NLS-2$
+		
+		this.toHTML(file);
+		return true;
+	}
+	
+	/**
+	 * Gets the HTML file.
+	 * @return the HTML file
+	 */
+	public File getHTMLFile() {
+		return file;
+	}
+
+	@Override
+	public boolean canCompute() {
+		return corpus != null;
+	}
+
+	@Override
+	public boolean setParameters(TXMParameters parameters) {
+		this.pMaxPropertiesToDisplay = parameters.getInteger(PropertiesPreferences.MAX_PROPERTIES_TO_DISPLAY);
+		return true;
+	}
+
+	@Override
+	public boolean loadParameters() {
+		// nothing to do -> all parameters are already managed by autoLoadParameters
+		return true;
+	}
+
+	
+	@Override
+	public boolean saveParameters() {
+		// nothing to do -> all parameters are already managed by autoSaveParameters
+		return true;
+	}
+
+	public Corpus getCorpus() {
+		return corpus;
+	}
+}

Property changes on: tmp/org.txm.information.core/src/org/txm/properties/core/functions/Properties.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.information.core/src/org/txm/properties/core/package.html
===================================================================
--- tmp/org.txm.information.core/src/org/txm/properties/core/package.html	(revision 0)
+++ tmp/org.txm.information.core/src/org/txm/properties/core/package.html	(revision 792)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<p>Diagnostic function</p>
+</body>
+</html>
\ No newline at end of file

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

Index: tmp/org.txm.information.core/src/org/txm/properties/core/preferences/PropertiesPreferences.java
===================================================================
--- tmp/org.txm.information.core/src/org/txm/properties/core/preferences/PropertiesPreferences.java	(revision 0)
+++ tmp/org.txm.information.core/src/org/txm/properties/core/preferences/PropertiesPreferences.java	(revision 792)
@@ -0,0 +1,36 @@
+package org.txm.properties.core.preferences;
+
+
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.service.prefs.Preferences;
+import org.txm.core.preferences.TXMPreferences;
+
+/**
+ * Information preferences initializer.
+ * @author sjacquot
+ *
+ */
+public class PropertiesPreferences extends TXMPreferences {
+
+	// auto populate the preference node qualifier from the current bundle id
+	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(PropertiesPreferences.class).getSymbolicName();
+	
+	public static final String PREFERENCES_PREFIX = "information_"; //$NON-NLS-1$
+	
+	
+	/**
+	 * The maximum number of word property values to display.
+	 */
+	public static final String MAX_PROPERTIES_TO_DISPLAY = PREFERENCES_PREFIX + "max_properties_to_display"; //$NON-NLS-1$
+
+	
+	@Override
+	public void initializeDefaultPreferences() {
+		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
+		
+		preferences.putInt(MAX_PROPERTIES_TO_DISPLAY, 10);
+		
+	}
+	
+}

Property changes on: tmp/org.txm.information.core/src/org/txm/properties/core/preferences/PropertiesPreferences.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.information.core/plugin.xml
===================================================================
--- tmp/org.txm.information.core/plugin.xml	(revision 791)
+++ tmp/org.txm.information.core/plugin.xml	(revision 792)
@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="org.txm.information.core.preferences.InformationPreferences">
+            class="org.txm.properties.core.preferences.PropertiesPreferences">
       </initializer>
    </extension>
 
Index: tmp/org.txm.information.core/.settings/org.eclipse.core.resources.prefs
===================================================================
--- tmp/org.txm.information.core/.settings/org.eclipse.core.resources.prefs	(revision 0)
+++ tmp/org.txm.information.core/.settings/org.eclipse.core.resources.prefs	(revision 792)
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//src/org/txm/properties/core/messages/messages_fr.properties=UTF-8

Property changes on: tmp/org.txm.information.core/.settings/org.eclipse.core.resources.prefs
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.information.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.information.core/META-INF/MANIFEST.MF	(revision 791)
+++ tmp/org.txm.information.core/META-INF/MANIFEST.MF	(revision 792)
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Information Core
-Bundle-SymbolicName: org.txm.information.core;singleton:=true
+Bundle-SymbolicName: org.txm.properties.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Textometrie.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.txm.information.core.functions,
- org.txm.information.core.messages,
- org.txm.information.core.preferences
+Export-Package: org.txm.properties.core.functions,
+ org.txm.properties.core.messages,
+ org.txm.properties.core.preferences
 Require-Bundle: org.txm.utils,
  org.txm.core;bundle-version="0.8.0",
  org.txm.searchengine.cqp.core;bundle-version="1.1.0"
Index: tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/AHCUIMessages.java
===================================================================
--- tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/AHCUIMessages.java	(revision 791)
+++ tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/AHCUIMessages.java	(revision 792)
@@ -10,9 +10,6 @@
  */
 public class AHCUIMessages extends NLS {
 	
-	private static final String BUNDLE_NAME = "org.txm.ahc.rcp.messages.messages"; //$NON-NLS-1$
-	
-	
 	public static String CAHPreferencePage_0;
 	public static String CAHPreferencePage_2;
 	public static String CAHPreferencePage_3;
@@ -36,7 +33,7 @@
 	
 	
 	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, AHCUIMessages.class);
+		Utf8NLS.initializeMessages(AHCUIMessages.class);
 	}
 
 	
