Révision 930

tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages_fr.properties (revision 930)
4 4

  
5 5
Factor_0 = ** Non implémenté
6 6

  
7
MatrixImpl_0  = Une variable ("
8
MatrixImpl_1  = ") n'existe pas dans l'espace de travail R.
9 7
MatrixImpl_10 = Index de ligne (
10 8
MatrixImpl_11 = ) trop grand (max 
11 9
MatrixImpl_13 = Index de colonne (
......
19 17
MatrixImpl_28 = Index de colonne (
20 18
MatrixImpl_29 = ) trop grand (max 
21 19
MatrixImpl_4  = Les noms de lignes d'une matrice de contingence ne peuvent pas être nuls.
22
MatrixImpl_5  = La dimension du vecteur des noms de lignes doit être égale au nombre de lignes de la matrice.
23 20
MatrixImpl_6  = Les noms de colonnes d'une matrice de contingence ne peuvent pas être nuls.
24 21
MatrixImpl_67 = Matrice: impossible d'obtenir le nombre de lignes: 
25
MatrixImpl_7  = La dimension du vecteur des noms de colonnes doit être égale au nombre de colonnes de la matrice (
26 22
MatrixImpl_73 = MatrixImpl: Erreur: la taille des colonnes diffère de l'originale
27 23
MatrixImpl_79 = Impossible d'obtenir les noms de lignes
28 24
MatrixImpl_88 = Impossible de supprimer toutes les lignes
29 25

  
30
QuantitativeDataStructureImpl_0 = Aucun objet de nom "
31
QuantitativeDataStructureImpl_1 = " dans l'espace de travail
32 26
QuantitativeDataStructureImpl_2 = ** Impossible de supprimer un objet qui n'existe pas.
33 27

  
34 28
VectorizeArray_0  = ** Rien à faire avec une matrice vide
tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages.properties (revision 930)
4 4

  
5 5
Factor_0 = ** Not implemented
6 6

  
7
MatrixImpl_0  = A variable ("
8
MatrixImpl_1  = ") does not exist in the R workspace.
9 7
MatrixImpl_10 = Row index (
10 8
MatrixImpl_11 = ) too big (max 
11 9
MatrixImpl_13 = Col index (
......
19 17
MatrixImpl_28 = Column index (
20 18
MatrixImpl_29 = ) too big (max 
21 19
MatrixImpl_4  = Row names of a contingency table cannot be null.
22
MatrixImpl_5  = Row names vector length must be equal to the number of rows of the matrix.
23 20
MatrixImpl_6  = Column names of a contingency table cannot be null
24 21
MatrixImpl_67 = Matrix: failed to get nrow: 
25
MatrixImpl_7  = Col names vector length must be equals to the number of columns of the matrix (
26 22
MatrixImpl_73 = MatrixImpl: Error: column size differs: original
27 23
MatrixImpl_79 = Failed to get row names
28 24
MatrixImpl_88 = Cannot delete all lines
29 25

  
30
QuantitativeDataStructureImpl_0 = No object with name "
31
QuantitativeDataStructureImpl_1 = " in the workspace
32 26
QuantitativeDataStructureImpl_2 = ** Cannot delete a non-existing object.
33 27

  
34 28
VectorizeArray_0  = ** Nothing to do with an empty matrix
tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/StatsEngineCoreMessages.java (revision 930)
3 3
import org.eclipse.osgi.util.NLS;
4 4
import org.txm.utils.messages.Utf8NLS;
5 5

  
6
/**
7
 * Statistics engine core messages.
8
 * 
9
 * @author sjacquot
10
 *
11
 */
6 12
public class StatsEngineCoreMessages extends NLS {
7 13

  
14
	private static final String BUNDLE_NAME = "org.txm.statsengine.core.messages.messages"; //$NON-NLS-1$
8 15
	
9 16
	public static String error_statsEngineNotReadyCancelingCommand;
10 17

  
......
23 30
	public static String ArrayIndex_0;
24 31
	public static String ArrayIndex_1;
25 32
	public static String Factor_0;
26
	public static String MatrixImpl_0;
27
	public static String MatrixImpl_1;
28 33
	public static String MatrixImpl_10;
29 34
	public static String MatrixImpl_11;
30 35
	public static String MatrixImpl_13;
......
38 43
	public static String MatrixImpl_28;
39 44
	public static String MatrixImpl_29;
40 45
	public static String MatrixImpl_4;
41
	public static String MatrixImpl_5;
42 46
	public static String MatrixImpl_6;
43 47
	public static String MatrixImpl_67;
44
	public static String MatrixImpl_7;
45 48
	public static String MatrixImpl_73;
46 49
	public static String MatrixImpl_79;
47 50
	public static String MatrixImpl_88;
48 51

  
49
	public static String QuantitativeDataStructureImpl_0;
50
	public static String QuantitativeDataStructureImpl_1;
51 52
	public static String QuantitativeDataStructureImpl_2;
52 53

  
53 54
	static {
54 55
		// initialize resource bundle
55
		Utf8NLS.initializeMessages(StatsEngineCoreMessages.class);
56
		Utf8NLS.initializeMessages(BUNDLE_NAME, StatsEngineCoreMessages.class);
56 57
	}
57 58

  
58 59
	private StatsEngineCoreMessages() {
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java (revision 930)
70 70
import org.txm.statsengine.core.StatException;
71 71
import org.txm.statsengine.core.data.Vector;
72 72
import org.txm.statsengine.r.rcp.views.RVariablesView;
73
import org.txm.utils.logger.Log;
73 74
/**
74 75
 * display the lexical table tools to merge/delete lines or columns and display
75 76
 * the lexical table too
......
649 650
				String[] colnames = lexicalTable.getColNames().asStringsArray();
650 651
				TableColumn[] cols = viewer.getTable().getColumns();
651 652
				if (colnames.length > cols.length) {
652
					System.out.println(LexicalTableUIMessages.LexicalTableEditor_1+Arrays.toString(cols)+LexicalTableUIMessages.LexicalTableEditor_7+Arrays.toString(colnames)+" ");  //$NON-NLS-1$
653
					Log.severe(LexicalTableUIMessages.bind(LexicalTableUIMessages.LexicalTableEditor_1, Arrays.toString(cols), Arrays.toString(colnames)));
653 654
					return;
654 655
				}
655 656
				for (int i = 0; i < colnames.length ; i++) {
......
661 662
				viewer.getTable().getParent().layout();
662 663
				refreshTable(false);
663 664
			} else {
664
				System.out.println(LexicalTableUIMessages.LexicalTableEditor_14);
665
				Log.severe(LexicalTableUIMessages.LexicalTableEditor_14);
665 666
			}
666 667
		} catch(Exception e) {
667
			System.out.println(LexicalTableUIMessages.LexicalTableEditor_15+e);
668
			Log.severe(LexicalTableUIMessages.bind(LexicalTableUIMessages.LexicalTableEditor_15, e));
668 669
			org.txm.rcp.utils.Logger.printStackTrace(e);
669 670
		}
670 671
	}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java (revision 930)
83 83
			IWorkbenchWindow window = TXMWindows.getActiveWindow();
84 84
			List<Index> vocabularies = ((IStructuredSelection) HandlerUtil.getCurrentSelection(event)).toList();
85 85
			
86
			System.out.println(LexicalTableUIMessages.ComputeLexicalTable_3);
86
			Log.info(LexicalTableUIMessages.ComputeLexicalTable_3);
87 87
			ArrayList<String> choices = new ArrayList<String>();
88 88
			choices.add(LexicalTableUIMessages.ComputeLexicalTable_16);
89 89
			choices.add(LexicalTableUIMessages.ComputeLexicalTable_12);
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/preferences/LexicalTablePreferencePage.java (revision 930)
30 30
import org.eclipse.jface.preference.IntegerFieldEditor;
31 31
import org.eclipse.ui.IWorkbench;
32 32
import org.txm.core.messages.TXMCoreMessages;
33
import org.txm.core.preferences.TXMPreferences;
34
import org.txm.lexicaltable.core.messages.LexicalTableCoreMessages;
33 35
import org.txm.lexicaltable.core.preferences.LexicalTablePreferences;
34 36
import org.txm.lexicaltable.rcp.adapters.LexicalTableAdapterFactory;
35
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
36 37
import org.txm.rcp.preferences.TXMPreferencePage;
37 38
import org.txm.rcp.preferences.TXMPreferenceStore;
38 39

  
39 40
/**
40
 * Lexical Table preferences page.
41
 * Lexical table preferences page.
41 42
 * 
42 43
 * @author mdecorde
43 44
 * @author sjacquot
......
49 50
	@Override
50 51
	public void createFieldEditors() {
51 52
		
52
		IntegerFieldEditor fmin = new IntegerFieldEditor(LexicalTablePreferences.F_MIN, TXMCoreMessages.common_lowestFrequency, this.getFieldEditorParent()); 
53
		IntegerFieldEditor fmin = new IntegerFieldEditor(TXMPreferences.F_MIN, TXMCoreMessages.common_lowestFrequency, this.getFieldEditorParent()); 
53 54
		fmin.setValidRange(1, 999999999);
54 55
		
55
		IntegerFieldEditor vmax = new IntegerFieldEditor(LexicalTablePreferences.V_MAX, TXMCoreMessages.common_numberOfLines, this.getFieldEditorParent()); 
56
		IntegerFieldEditor vmax = new IntegerFieldEditor(TXMPreferences.V_MAX, TXMCoreMessages.common_numberOfLines, this.getFieldEditorParent()); 
56 57
		vmax.setValidRange(1, 999999999);
57 58
		
58 59
		this.addField(fmin);
......
63 64
	@Override
64 65
	public void init(IWorkbench workbench) {
65 66
		this.setPreferenceStore(new TXMPreferenceStore(LexicalTablePreferences.PREFERENCES_NODE));
66
		this.setTitle(LexicalTableUIMessages.LexicalTablePreferencePage_0);
67
		this.setTitle(LexicalTableCoreMessages.RESULT_TYPE);
67 68
		this.setImageDescriptor(LexicalTableAdapterFactory.ICON);
68 69
	}
69 70

  
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_fr.properties (revision 930)
1 1

  
2
ComputeLexicalTable_0  = Calcul de la table lexicale avec {0}.
3
ComputeLexicalTable_1  = Calcul de la table lexicale {0} avec la propriété {1}.
4
ComputeLexicalTable_10 = Ouverture de la table lexicale.
5 2
ComputeLexicalTable_12 = Total toutes les occurrences recenses par l'index 
6 3
ComputeLexicalTable_13 = Sélectionnez les marges à utiliser
7 4
ComputeLexicalTable_16 = Total  toutes les occurrences du corpus 
8
ComputeLexicalTable_2  = Pas de propriété
9 5
ComputeLexicalTable_3  = Ouverture de la boite de dialogue de configuration des marges
10
ComputeLexicalTable_5  = ** Impossible de créer une table lexicale à partir d'un Index créé sur un corpus
11
ComputeLexicalTable_6  = ** Les vocabulaires doivent être composés de la même combinaison de propriétés : {0}
12
ComputeLexicalTable_7  = Les vocabulaires doivent avoir la même partition : {0}
13
ComputeLexicalTable_9  = ** Boite de dialogue de la table lexicale : impossible d''obtenir la taille du corpus. Cause {0}
6
ComputeLexicalTable_5  = ** Impossible de créer une table lexicale à partir d'un index créé sur un corpus.
7
ComputeLexicalTable_6  = ** Les vocabulaires doivent être composés de la même combinaison de propriétés : {0}.
8
ComputeLexicalTable_7  = ** Les vocabulaires doivent avoir la même partition : {0}.
14 9

  
15
LexicalTableEditor_1  = ** Erreur : le nombre de colonne diffère : avant 
10
LexicalTableEditor_1  = ** Erreur : le nombre de colonne diffère : avant {0} après {1}.
16 11
LexicalTableEditor_10 = Fusion ou Suppr. de colonnes
17 12
LexicalTableEditor_11 = Fusion de colonnes : {0}
18 13
LexicalTableEditor_12 = Suppr. de colonnes : {0}
19 14
LexicalTableEditor_13 = Fusion ou Suppr. de lignes
20
LexicalTableEditor_14 = ** L'importation de la table lexicale a échoué
21
LexicalTableEditor_15 = ** Erreur lors de l'importation des données :  
22
LexicalTableEditor_16 = Filtrage de lignes
15
LexicalTableEditor_14 = ** L'importation de la table lexicale a échoué.
16
LexicalTableEditor_15 = ** Erreur lors de l'importation des données : {0}.
23 17
LexicalTableEditor_18 = Fusion de lignes
24
LexicalTableEditor_4  = Appliquer
25
LexicalTableEditor_5  = Garder {0} lignes, Fmin {1}
26
LexicalTableEditor_7  = \ après  
27

  
28
LexicalTablePreferencePage_0 = Table lexicale
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java (revision 930)
3 3
import org.eclipse.osgi.util.NLS;
4 4
import org.txm.utils.messages.Utf8NLS;
5 5

  
6
/**
7
 * Lexical table UI messages.
8
 * 
9
 * @author sjacquot
10
 *
11
 */
6 12
public class LexicalTableUIMessages extends NLS {
7 13

  
14
	private static final String BUNDLE_NAME = "org.txm.lexicaltable.rcp.messages.messages"; //$NON-NLS-1$
15
	
8 16
	public static String LexicalTableEditor_1;
9 17
	public static String LexicalTableEditor_10;
10 18
	public static String LexicalTableEditor_11;
......
12 20
	public static String LexicalTableEditor_13;
13 21
	public static String LexicalTableEditor_14;
14 22
	public static String LexicalTableEditor_15;
15
	public static String LexicalTableEditor_16;
16 23
	public static String LexicalTableEditor_18;
17
	public static String LexicalTableEditor_4;
18
	public static String LexicalTableEditor_5;
19
	public static String LexicalTableEditor_7;
20
	public static String LexicalTablePreferencePage_0;
21
	public static String ComputeLexicalTable_10;
22 24
	public static String ComputeLexicalTable_12;
23 25
	public static String ComputeLexicalTable_13;
24 26
	public static String ComputeLexicalTable_16;
......
31 33

  
32 34
	static {
33 35
		// initialize resource bundle
34
		Utf8NLS.initializeMessages(LexicalTableUIMessages.class);
36
		Utf8NLS.initializeMessages(BUNDLE_NAME, LexicalTableUIMessages.class);
35 37
	}
36 38
}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages.properties (revision 930)
1 1

  
2
ComputeLexicalTable_0  = Computing the Lexical Table with {0}
3
ComputeLexicalTable_1  = Computing the Lexical Table {0} with the property {1}
4
ComputeLexicalTable_10 = Opening the lexical table.
5 2
ComputeLexicalTable_12 = User index occurrences
6 3
ComputeLexicalTable_13 = Select which margins you want to use
7 4
ComputeLexicalTable_16 = Use all occurrences
8
ComputeLexicalTable_2  = No property
9 5
ComputeLexicalTable_3  = Opening marge configuration dialog
10
ComputeLexicalTable_5  = Can not create a lexical table with an Index created on a Corpus
11
ComputeLexicalTable_6  = Vocabularies must share the same properties: {0}
12
ComputeLexicalTable_7  = Vocabularies must share the same partition: {0}
13
ComputeLexicalTable_9  = LexicalTable dialog, failed to get corpus size: {0}
6
ComputeLexicalTable_5  = ** Can not create a lexical table with an index created on a corpus.
7
ComputeLexicalTable_6  = ** Vocabularies must share the same properties: {0}.
8
ComputeLexicalTable_7  = ** Vocabularies must share the same partition: {0}.
14 9

  
15
LexicalTableEditor_1  = ** Error: different columns number: before
10
LexicalTableEditor_1  = ** Error: different columns number: before {0} after {1}.
16 11
LexicalTableEditor_10 = Merge or Delete columns
17 12
LexicalTableEditor_11 = Merge cols: {0}
18 13
LexicalTableEditor_12 = Delete cols: {0}
19 14
LexicalTableEditor_13 = Merge or Delete rows
20
LexicalTableEditor_14 = ** Failed to import lexical table
21
LexicalTableEditor_15 = ** Error while importing data:
22
LexicalTableEditor_16 = Filtering lines
15
LexicalTableEditor_14 = ** Failed to import lexical table.
16
LexicalTableEditor_15 = ** Error while importing data: {0}.
23 17
LexicalTableEditor_18 = Merging lines
24
LexicalTableEditor_4  = Apply
25
LexicalTableEditor_5  = Keep: {0} lines, Fmin {1}
26
LexicalTableEditor_7  = \ after
27

  
28
LexicalTablePreferencePage_0 = Lexical table
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_ru.properties (revision 930)
1 1

  
2
ComputeLexicalTable_0  = Составление словарной таблицы {0}
3
ComputeLexicalTable_1  = Составление словарной таблицы {0} со свойством {1}
4
ComputeLexicalTable_10 = Открытие словарной таблицы
5 2
ComputeLexicalTable_12 = Употребления в индексе
6 3
ComputeLexicalTable_13 = Выберите пределы для расчетов
7 4
ComputeLexicalTable_16 = Использовать все употребления
8
ComputeLexicalTable_2  = 
9 5
ComputeLexicalTable_3  = Открытие диалогового окна конфигурации пределов
10 6
ComputeLexicalTable_5  = ** Невозможно построить словарную таблицу из Индекса, рассчитанного на корпусе
11 7
ComputeLexicalTable_6  = ** Списки значений должны строиться на одинаковых сочетаниях свойств: {0}
12
ComputeLexicalTable_7  = Списки значений должны иметь одинаковое распределение: {0}
13
ComputeLexicalTable_9  = ** Диалоговое окно словарной таблицы: невозможно получить размер корпуса. Причина {0}
8
ComputeLexicalTable_7  = ** Списки значений должны иметь одинаковое распределение: {0}
14 9

  
15
LexicalTableEditor_1  = ** Ошибка: Не совпадает число колонок: до 
10
LexicalTableEditor_1  = ** Ошибка: Не совпадает число колонок: до {0} после {1}
16 11
LexicalTableEditor_10 = Объед. или Удал. колонок
17 12
LexicalTableEditor_11 = Объед. колонок: {0}
18 13
LexicalTableEditor_12 = Удал. колонок: {0}
19 14
LexicalTableEditor_13 = Объед. или Удал. строк
20 15
LexicalTableEditor_14 = ** Не удалось импортировать словарную таблицу
21
LexicalTableEditor_15 = ** Ошибка при импортировании данных:  
22
LexicalTableEditor_16 = Фильтрация строк
16
LexicalTableEditor_15 = ** Ошибка при импортировании данных: {0}
23 17
LexicalTableEditor_18 = Объединение строк
24
LexicalTableEditor_4  = Оставить
25
LexicalTableEditor_5  = Оставить {0} строк, Fmin {1}
26
LexicalTableEditor_7  = \ после  
27

  
28
LexicalTablePreferencePage_0 = Словарная таблица
tmp/org.txm.lexicaltable.rcp/OSGI-INF/l10n/bundle.properties (revision 930)
9 9

  
10 10
command.name.40 = Import Table
11 11

  
12
command.tooltip = Compute Lexical Table
12
command.tooltip = Compute lexical table
13 13

  
14
editor.name = Lexical Table
14
editor.name = Lexical table
15 15

  
16
page.name = Lexical Table
16
page.name = Lexical table
tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/handlers/ComputeWordCloud.java (revision 930)
106 106

  
107 107
		}
108 108
		
109
		StatusLine.setMessage(WordCloudCoreMessages.info_OpeningWordCloudResult);
109
		StatusLine.setMessage(WordCloudCoreMessages.info_openingWordCloudResult);
110 110

  
111 111
		ChartEditor.openEditor(wordCloud);
112 112
							
tmp/org.txm.queryindex.rcp/src/org/txm/rcp/commands/link/QueryIndexToLexicalTable.java (revision 930)
47 47
import org.txm.rcp.messages.TXMUIMessages;
48 48
import org.txm.searchengine.cqp.corpus.Partition;
49 49
import org.txm.searchengine.cqp.corpus.Property;
50
import org.txm.utils.logger.Log;
50 51
// TODO: Auto-generated Javadoc
51 52
/**
52 53
 * The Class IndexToLexicalTable.
......
92 93
			return false;
93 94
		}
94 95

  
95
		System.out.println(LexicalTableUIMessages.ComputeLexicalTable_3);
96
		Log.info(LexicalTableUIMessages.ComputeLexicalTable_3);
96 97
		ArrayList<String> choices = new ArrayList<String>();
97 98
		choices.add(LexicalTableUIMessages.ComputeLexicalTable_16);
98 99
		choices.add(LexicalTableUIMessages.ComputeLexicalTable_12);
tmp/org.txm.index.rcp/src/org/txm/index/rcp/preferences/IndexPreferencesPage.java (revision 930)
2 2

  
3 3
import org.eclipse.jface.preference.IntegerFieldEditor;
4 4
import org.eclipse.ui.IWorkbench;
5
import org.txm.core.preferences.TXMPreferences;
5 6
import org.txm.index.core.preferences.IndexPreferences;
6 7
import org.txm.index.rcp.adapters.IndexAdapterFactory;
7 8
import org.txm.rcp.preferences.TXMPreferencePage;
......
19 20

  
20 21
	@Override
21 22
	protected void createFieldEditors() {
22
		this.addField(new IntegerFieldEditor(IndexPreferences.N_LINES_PER_PAGE, "Number of lines per result page", this.getFieldEditorParent()));
23
		this.addField(new IntegerFieldEditor(TXMPreferences.N_LINES_PER_PAGE, "Number of lines per result page", this.getFieldEditorParent()));
23 24
	}
24 25
}
tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java (revision 930)
126 126
	
127 127
	
128 128
	/** The query widget. */
129
	@Parameter(key=IndexPreferences.QUERY)
129
	@Parameter(key=TXMPreferences.QUERY)
130 130
	protected AssistedQueryWidget queryWidget;
131 131

  
132 132
	/** The Fmin spinner. */
133
	@Parameter(key=IndexPreferences.F_MIN)
133
	@Parameter(key=TXMPreferences.F_MIN)
134 134
	protected Spinner fMinSpinner;
135 135

  
136 136
	/** The Fmax spinner. */
137
	@Parameter(key=IndexPreferences.F_MAX)
137
	@Parameter(key=TXMPreferences.F_MAX)
138 138
	protected Spinner fMaxSpinner;
139 139

  
140 140
	/** The Tmax spinner. */
141
	@Parameter(key=IndexPreferences.V_MAX)
141
	@Parameter(key=TXMPreferences.V_MAX)
142 142
	protected Spinner vMaxSpinner;
143 143

  
144 144
	/** The N ligne p page spinner. */
145
	@Parameter(key=IndexPreferences.N_LINES_PER_PAGE)
145
	@Parameter(key=TXMPreferences.N_LINES_PER_PAGE)
146 146
	protected Spinner nLinesPerPageSpinner;
147 147
	
148 148
	/**
tmp/org.txm.index.core/src/org/txm/index/core/preferences/IndexPreferences.java (revision 930)
16 16

  
17 17
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(IndexPreferences.class).getSymbolicName();
18 18
	
19
	/**
20
	 * Number of lines to display per page.
21
	 */
22
	public static final String N_LINES_PER_PAGE = "n_lines_per_page"; //$NON-NLS-1$
23 19
	
24 20
	/**
25 21
	 * 
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/functions/LexicalTable.java (revision 930)
241 241
	/**
242 242
	 * Creates the lexical table.
243 243
	 *
244
	 * @param vocabularies the vocabularies
244
	 * @param indexes the vocabularies
245 245
	 * @param symbol the symbol
246 246
	 * @param useAllOccurrences 
247 247
	 * @return the lexical table
248 248
	 * @throws RWorkspaceException the r workspace exception
249 249
	 */
250
	protected void _computeFromIndexes(List<Index> vocabularies) throws RWorkspaceException {
250
	protected void _computeFromIndexes(List<Index> indexes) throws RWorkspaceException {
251 251
		
252
		System.out.println(LexicalTableCoreMessages.LexicalTableImpl_1 + vocabularies);
252
		Log.info(LexicalTableCoreMessages.bind(LexicalTableCoreMessages.info_buildingLexicalTableWith, indexes));
253 253
		
254
		Index partIndex = vocabularies.get(0);// FRIGO
254
		Index partIndex = indexes.get(0);// FRIGO
255 255
		Partition partition = partIndex.getPartition(); // the Index is computed on a partition
256 256

  
257 257
		if (!partIndex.isComputedWithPartition()) {
258
			throw new IllegalArgumentException("Vocabularies are not computed with a partition. Aborting.");
258
			throw new IllegalArgumentException("Indexes are not computed with a partition. Aborting.");
259 259
		}
260 260

  
261 261
		this.property = partIndex.getProperties().get(0);
262 262

  
263 263
		HashMap<String, Line> alllines = new HashMap<String, Line>();
264 264
		// merge lines of all indexes
265
		for (Index voc : vocabularies) {
265
		for (Index voc : indexes) {
266 266
			for (Line l : voc.getAllLines()) {
267 267
				if (alllines.containsKey(l.getSignature())) {
268 268
					Line ll = alllines.get(l.getSignature());
......
315 315
				for (i = 0 ; i < reste.length ; i++) {
316 316
					reste[i] = partitionSizes[i] - margins[i];
317 317
					if (reste[i] < 0) {
318
						System.out.println(LexicalTableCoreMessages.LexicalTableImpl_12+i+LexicalTableCoreMessages.LexicalTableImpl_13);
319
						throw new IllegalArgumentException(LexicalTableCoreMessages.LexicalTableImpl_12+i+LexicalTableCoreMessages.LexicalTableImpl_13);
318
						Log.severe(LexicalTableCoreMessages.error_marginIsHigherThanThePartitionSize);
319
						throw new IllegalArgumentException(LexicalTableCoreMessages.error_marginIsHigherThanThePartitionSize);
320 320
					}
321 321
					mat[lines.size()][i] = reste[i];
322 322
				}
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/statsengine/r/data/LexicalTableImpl.java (revision 930)
281 281
		String[] split = line.split("\t"); //$NON-NLS-1$
282 282
		int ncol = split.length;
283 283
		if (ncol <= 1) {
284
			throw new IOException(LexicalTableCoreMessages.LexicalTableImpl_5+ncol+")"); //$NON-NLS-1$
284
			throw new IOException(LexicalTableCoreMessages.bind(LexicalTableCoreMessages.error_notEnoughColumns, ncol));
285 285
		}
286 286

  
287 287
		int nlines = getNline(tsvFile);
......
296 296
				for( int j = 1 ; j < ncol ; j++)
297 297
					freqs[i][j-1] = Integer.parseInt(split[j]);
298 298
			} else {
299
				throw new IOException(LexicalTableCoreMessages.LexicalTableImpl_8+i+LexicalTableCoreMessages.LexicalTableImpl_9+ncol+LexicalTableCoreMessages.LexicalTableImpl_10);
299
				throw new IOException(LexicalTableCoreMessages.bind(LexicalTableCoreMessages.error_lineXDoesNotHaveXXolumns, i, ncol));
300 300
			}
301 301
			i++;
302 302
			line = reader.readLine();
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages.properties (revision 930)
1 1

  
2
LexicalTableImpl_1  = Building lexical table with: 
3
LexicalTableImpl_10 = columns
4
LexicalTableImpl_12 = Error: margin 
5
LexicalTableImpl_13 = is higher than the partition size
6
LexicalTableImpl_5  = not enough columns: minimum 2 (here: 
7
LexicalTableImpl_8  = line
8
LexicalTableImpl_9  = does not have 
9

  
10 2
RESULT_TYPE = Lexical table
3

  
4
error_lineXDoesNotHaveXXolumns           = Line {0} does not have {1} column(s).
5
error_marginIsHigherThanThePartitionSize = Error: margin is higher than the partition size.
6
error_notEnoughColumns                   = Not enough columns: minimum 2 (here: {0}).
7

  
8
info_buildingLexicalTableWith = Building lexical table with: {0}.
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages_ru.properties (revision 930)
1 1

  
2
RESULT_TYPE = 
2
RESULT_TYPE = Словарная таблица
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages_fr.properties (revision 930)
1 1

  
2
LexicalTableImpl_1  = Construction de la table lexicale avec : 
3
LexicalTableImpl_10 = colonnes
4
LexicalTableImpl_12 = Erreur: les marges
5
LexicalTableImpl_13 = \ sont plus grandes que la taille des parties
6
LexicalTableImpl_8  = ligne
7
LexicalTableImpl_9  = n'a pas 
8

  
9 2
RESULT_TYPE = Table lexicale
10 3

  
11
sLexicalTableImpl_5 = pas assez de colonnes : minimum 2 (ici : 
4
error_lineXDoesNotHaveXXolumns           = La ligne {0} n'a pas {1} colonne(s).
5
error_marginIsHigherThanThePartitionSize = Erreur : les marges sont plus grandes que la taille des parties.
6
error_notEnoughColumns                   = Pas assez de colonnes : minimum 2 (ici : {0}).
7

  
8
info_buildingLexicalTableWith = Construction de la table lexicale avec : {0}.
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/LexicalTableCoreMessages.java (revision 930)
3 3
import org.eclipse.osgi.util.NLS;
4 4
import org.txm.utils.messages.Utf8NLS;
5 5

  
6
/**
7
 * Lexical table core messages.
8
 * 
9
 * @author sjacquot
10
 *
11
 */
6 12
public class LexicalTableCoreMessages extends NLS {
7 13
	
8 14
	private static final String BUNDLE_NAME = "org.txm.lexicaltable.core.messages.messages"; //$NON-NLS-1$
9 15
	
10 16
	public static String RESULT_TYPE;
11 17
	
12
	public static String LexicalTableImpl_1;
13
	public static String LexicalTableImpl_10;
14
	public static String LexicalTableImpl_12;
15
	public static String LexicalTableImpl_13;
16
	public static String LexicalTableImpl_5;
17
	public static String LexicalTableImpl_8;
18
	public static String LexicalTableImpl_9;
18
	public static String info_buildingLexicalTableWith;
19
	public static String error_marginIsHigherThanThePartitionSize;
20
	public static String error_notEnoughColumns;
21
	public static String error_lineXDoesNotHaveXXolumns;
19 22

  
20 23
	static {
21 24
		// initialize resource bundle
tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/messages_fr.properties (revision 930)
1 1

  
2
ComputeWordCloud_6 = Echec de l'installation du package {0}.
3

  
4 2
RESULT_TYPE = Nuage de mots
5 3

  
6
error_RPackagesInstallationFailed = Les packages nécessaires au fonctionnement de la fonctionnalité n'ont pas pu être installés. Voir les instructions pour installation manuelle à l'adresse https://groupes.renater.fr/wiki/txm-users/public/extensions#wordcloud
7 4
error_couldNotInstallRPackage     = Le package R {0} n'a pas pu être installé. Raison : {1}. 
5
error_rPackagesInstallationFailed = Les packages nécessaires au fonctionnement de la fonctionnalité n'ont pas pu être installés. Voir les instructions pour installation manuelle à l'adresse https://groupes.renater.fr/wiki/txm-users/public/extensions#wordcloud
8 6

  
9
info_OpeningWordCloudResult = Ouverture du résultat.
10
info_RPackagesLoaded        = Les packages R ont été chargés. Lancement du calcul.
11
info_aborting               = Abandon du calcul.
7
info_aborting               = Abandon du calcul du nuage de mots.
12 8
info_installingRPackage     = Installation du package R {0}...
13 9
info_loadingRPackage        = Chargement du package : 
10
info_openingWordCloudResult = Ouverture du résultat.
11
info_rPackagesLoaded        = Les packages R ont été chargés. Lancement du calcul.
tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/messages.properties (revision 930)
1 1

  
2 2
RESULT_TYPE = Word cloud
3 3

  
4
error_RPackagesInstallationFailed = The necessary R packages have not been installed properly, it is not possible to complete the installation of the WordCloud command.\nSee instructions at https://groupes.renater.fr/wiki/txm-users/public/extensions#wordcloud 
5 4
error_couldNotInstallRPackage     = Could not install the {0} package.
5
error_rPackagesInstallationFailed = The necessary R packages have not been installed properly, it is not possible to complete the installation of the WordCloud command.\nSee instructions at https://groupes.renater.fr/wiki/txm-users/public/extensions#wordcloud 
6 6

  
7
info_OpeningWordCloudResult = Opening word cloud result.
8
info_RPackagesLoaded        = R packages loaded. Now running WordCloud.
9
info_aborting               = Aborting WordCloud.
7
info_aborting               = Aborting word cloud computing.
10 8
info_installingRPackage     = Installing {0} R package...
11 9
info_loadingRPackage        = Loading package:
10
info_openingWordCloudResult = Opening word cloud result.
11
info_rPackagesLoaded        = R packages loaded. Now running WordCloud.
tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/WordCloudCoreMessages.java (revision 930)
20 20
	public static String error_couldNotInstallRPackage;
21 21
	public static String info_installingRPackage;
22 22
	public static String info_loadingRPackage;
23
	public static String error_RPackagesInstallationFailed;
24
	public static String info_RPackagesLoaded;
25
	public static String info_OpeningWordCloudResult;
23
	public static String error_rPackagesInstallationFailed;
24
	public static String info_rPackagesLoaded;
25
	public static String info_openingWordCloudResult;
26 26

  
27 27
	
28 28
	static {
tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/functions/WordCloud.java (revision 930)
194 194
		}
195 195

  
196 196
		if (installFailed) {
197
			System.out.println(WordCloudCoreMessages.error_RPackagesInstallationFailed);
197
			System.out.println(WordCloudCoreMessages.error_rPackagesInstallationFailed);
198 198
			return false;
199 199
		} else {
200
			Log.info(WordCloudCoreMessages.info_RPackagesLoaded);
200
			Log.info(WordCloudCoreMessages.info_rPackagesLoaded);
201 201
			return true;
202 202
		}
203 203
	}
tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/chartsengine/r/RWordCloudChartCreator.java (revision 930)
9 9
import org.txm.statsengine.r.core.RWorkspace;
10 10
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
11 11
import org.txm.wordcloud.core.functions.WordCloud;
12
import org.txm.wordcloud.core.preferences.WordCloudPreferences;
13 12

  
14 13
public class RWordCloudChartCreator extends RChartCreator {
15 14

  
tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_fr.properties (revision 930)
1 1

  
2
ChartsEngine_PROGRESSION_TITLE_DENSITY               = (densité)
3
ChartsEngine_PROGRESSION_TITLE_IN                    = dans
4
ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF        = Progression de
5
ChartsEngine_PROGRESSION_TITLE_PROPERTY              = , propriété :  
6
ChartsEngine_PROGRESSION_TITLE_REGEX                 = , filtrage REGEX: 
7
ChartsEngine_PROGRESSION_TITLE_STRUCT                = structure :  
8
ChartsEngine_PROGRESSION_X_AXIS_LABEL                = T = {0}
9
ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL     = Occurrences
10
ChartsEngine_PROGRESSION_Y_AXIS_NOT_CUMULATIVE_LABEL = Densité
2
ChartsEngine_PROGRESSION_TITLE_DENSITY           = (densité)
3
ChartsEngine_PROGRESSION_TITLE_IN                = dans
4
ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF    = Progression de
5
ChartsEngine_PROGRESSION_TITLE_PROPERTY          = , propriété :  
6
ChartsEngine_PROGRESSION_TITLE_REGEX             = , filtrage REGEX: 
7
ChartsEngine_PROGRESSION_TITLE_STRUCT            = structure :  
8
ChartsEngine_PROGRESSION_X_AXIS_LABEL            = T = {0}
9
ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL = Occurrences
11 10

  
12 11
ComputeProgression_0 = La fonctionnalité Progression n'est pas encore disponible pour les sous-corpus discontinus.
13 12
ComputeProgression_3 = Terminé: pas de match trouvé.
tmp/org.txm.progression.core/src/org/txm/progression/core/messages/ProgressionCoreMessages.java (revision 930)
18 18

  
19 19
	public static String ChartsEngine_PROGRESSION_X_AXIS_LABEL;
20 20
	public static String ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL;
21
	public static String ChartsEngine_PROGRESSION_Y_AXIS_NOT_CUMULATIVE_LABEL;
22 21

  
23 22
	public static String ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF;
24 23
	public static String ChartsEngine_PROGRESSION_TITLE_IN;
tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages.properties (revision 930)
1 1

  
2
ChartsEngine_PROGRESSION_TITLE_DENSITY               = (density)
3
ChartsEngine_PROGRESSION_TITLE_IN                    = in
4
ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF        = Progression of
5
ChartsEngine_PROGRESSION_TITLE_PROPERTY              = , property: 
6
ChartsEngine_PROGRESSION_TITLE_REGEX                 = , filtering REGEX: 
7
ChartsEngine_PROGRESSION_TITLE_STRUCT                = structure: 
8
ChartsEngine_PROGRESSION_X_AXIS_LABEL                = T = {0}
9
ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL     = Occurrences
10
ChartsEngine_PROGRESSION_Y_AXIS_NOT_CUMULATIVE_LABEL = Density
2
ChartsEngine_PROGRESSION_TITLE_DENSITY           = (density)
3
ChartsEngine_PROGRESSION_TITLE_IN                = in
4
ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF    = Progression of
5
ChartsEngine_PROGRESSION_TITLE_PROPERTY          = , property: 
6
ChartsEngine_PROGRESSION_TITLE_REGEX             = , filtering REGEX: 
7
ChartsEngine_PROGRESSION_TITLE_STRUCT            = structure: 
8
ChartsEngine_PROGRESSION_X_AXIS_LABEL            = T = {0}
9
ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL = Occurrences
11 10

  
12 11
ComputeProgression_0 = The Progression command is not yet available for discontinuous sub-corpora.
13 12
ComputeProgression_3 = Done: no match found.
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_fr.properties (revision 930)
6 6
error_evaluationError                    = ** Erreur d'évaluation : {0}\n{1}.
7 7
error_failedToConnectToTheRWorkspace     = ** Echec de connexion à l'espace de travail R.
8 8
error_failedToInitializeFileTransfert    = ** Echec de l'initialisation du transfert : {0}.
9
error_failedToKillRServe                 = Echec de la commande 'taskkill /IM Rserve.exe /F'.
10
error_failedToKillRServe2                = Echec de la commande 'tskill Rserve.exe'.
11
error_failedToKillRServe3                = Echec de la commande 'killall -9 Rserve-bin.so'.
12 9
error_failedToLoadLibrary                = La librairie {0} n'a pu être chargée : {1}.
13 10
error_failedToRunREG                     = ** Echec du lancement de REG pour localiser le programme R.
14 11
error_failedToStartRServe                = Impossible de démarrer RServe.
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java (revision 930)
21 21
	public static String error_evaluationError;
22 22
	public static String error_failedToConnectToTheRWorkspace;
23 23
	public static String error_failedToInitializeFileTransfert;
24
	public static String error_failedToKillRServe2;
25
	public static String error_failedToKillRServe3;
26
	public static String error_failedToKillRServe;
27 24
	public static String error_failedToLoadLibrary;
28 25
	public static String error_failedToRunREG;
29 26
	public static String error_failedToStartRServe;
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties (revision 930)
6 6
error_evaluationError                    = ** Evaluation error: {0}\n{1}.
7 7
error_failedToConnectToTheRWorkspace     = ** Failed to connect to the R Workspace.
8 8
error_failedToInitializeFileTransfert    = ** Failed to initialize file transfert: {0}.
9
error_failedToKillRServe                 = Failed to exec 'taskkill /IM Rserve.exe /F'.
10
error_failedToKillRServe2                = Failed to exec 'tskill Rserve.exe'.
11
error_failedToKillRServe3                = Failed to exec 'killall -9 Rserve-bin.so'.
12 9
error_failedToLoadLibrary                = Failed to load the {0} library: {1}.
13 10
error_failedToRunREG                     = ** Failed to run REG to find the location of R program.
14 11
error_failedToStartRServe                = Failed to start RServe.

Formats disponibles : Unified diff