Révision 513

tmp/org.txm.synopticeditor.rcp/src/org/txm/rcp/synoptic/commands/OpenEdition.java (revision 513)
45 45
import org.txm.rcp.synoptic.editor.EditionSelectorDialog;
46 46
import org.txm.rcp.synoptic.editor.SynopticEditionEditor;
47 47
import org.txm.rcp.synoptic.editor.SynopticEditorInput;
48
import org.txm.rcp.Messages;
48
import org.txm.rcp.RCPMessages;
49 49
import org.txm.searchengine.cqp.corpus.Corpus;
50 50
import org.txm.searchengine.cqp.corpus.MainCorpus;
51 51
import org.txm.searchengine.cqp.corpus.Property;
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/TableEditor.java (revision 513)
42 42
import org.eclipse.ui.IEditorSite;
43 43
import org.eclipse.ui.PartInitException;
44 44
import org.eclipse.ui.part.EditorPart;
45
import org.txm.rcp.Messages;
45
import org.txm.rcp.RCPMessages;
46 46
import org.txm.rcp.editors.Tablable;
47 47
import org.txm.rcp.editors.TableKeyListener;
48 48
import org.txm.rcp.editors.TableSorter;
......
132 132
		table.setLinesVisible(true);
133 133

  
134 134
		if (!(iEditorInput instanceof Tablable)) {
135
			throw new IllegalArgumentException(Messages.TableEditor_0);
135
			throw new IllegalArgumentException(RCPMessages.TableEditor_0);
136 136
		}
137 137

  
138 138
		Tablable tableInput = (Tablable) iEditorInput;
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditorInput.java (revision 513)
40 40
import org.eclipse.ui.part.EditorPart;
41 41
import org.txm.lexicaltable.core.functions.LexicalTable;
42 42
import org.txm.rcp.editors.TXMResultEditorInput;
43
import org.txm.rcp.Messages;
43
import org.txm.rcp.RCPMessages;
44 44
import org.txm.rcp.editors.Tablable;
45 45
import org.txm.rcp.editors.input.AbstractTablable;
46 46
import org.txm.searchengine.cqp.corpus.Property;
......
94 94

  
95 95
			@Override
96 96
			public String[] getColumnTitles() {
97
				return new String[] { Messages.FrequencyListEditorInput_3,
98
						Messages.FrequencyListEditorInput_4 };
97
				return new String[] { RCPMessages.FrequencyListEditorInput_3,
98
						RCPMessages.FrequencyListEditorInput_4 };
99 99
			}
100 100

  
101 101
			@Override
102 102
			public String[] getColumnTypes() {
103
				return new String[] { Messages.FrequencyListEditorInput_5,
104
						Messages.FrequencyListEditorInput_6 };
103
				return new String[] { RCPMessages.FrequencyListEditorInput_5,
104
						RCPMessages.FrequencyListEditorInput_6 };
105 105
			}
106 106

  
107 107
			@Override
......
117 117
								v = res.getRow(i).asIntArray();
118 118
							} catch (StatException e) {
119 119
								System.err.println(NLS.bind(
120
										Messages.GraphicalLogger_0, e));
120
										RCPMessages.GraphicalLogger_0, e));
121 121
							}
122 122
							row.add(v);
123 123
						}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor2.java (revision 513)
66 66
import org.txm.lexicaltable.core.statsengine.data.ILexicalTable;
67 67
import org.txm.lexicaltable.rcp.handlers.MergeLines;
68 68
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
69
import org.txm.rcp.Messages;
69
import org.txm.rcp.RCPMessages;
70 70
import org.txm.rcp.StatusLine;
71 71
import org.txm.rcp.editors.TXMEditorPart;
72 72
import org.txm.rcp.editors.TableKeyListener;
......
161 161
		} else if (index == -1) { // freqs
162 162
			try {
163 163
				itable.sortByFreqs(reverse);
164
				StatusLine.setMessage(Messages.SORT_DONE);
164
				StatusLine.setMessage(RCPMessages.SORT_DONE);
165 165
			} catch (Exception e2) {
166 166
				org.txm.rcp.utils.Logger.printStackTrace(e2);
167 167
			}
......
205 205
				System.out.println(NLS.bind(LexicalTableUIMessages.LexicalTableEditor_5, nLinesSpinner.getSelection(), minfreqspinner.getSelection()));
206 206

  
207 207
				MessageBox messageBox = new MessageBox(e.display.getActiveShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO);
208
				messageBox.setMessage(Messages.DeleteLines_1);
208
				messageBox.setMessage(RCPMessages.DeleteLines_1);
209 209
				int response = messageBox.open();
210 210
				if (response != SWT.YES)
211 211
					return;
......
411 411
		formColumn.setLabelProvider(clp);
412 412
		
413 413
		freqColumn = new TableViewerColumn(viewer, SWT.LEFT);
414
		freqColumn.getColumn().setText(Messages.FrequencyListEditorInput_4); 
414
		freqColumn.getColumn().setText(RCPMessages.FrequencyListEditorInput_4); 
415 415
		freqColumn.getColumn().setWidth(200);
416 416
		freqColumn.getColumn().addSelectionListener(new ColumnSelectionListener(freqColumn, -1));
417 417
		freqColumn.setLabelProvider(clp);
......
609 609
		 */
610 610
		@Override
611 611
		public void widgetSelected(SelectionEvent e) {
612
			StatusLine.setMessage(Messages.SORT_COLUMN);
612
			StatusLine.setMessage(RCPMessages.SORT_COLUMN);
613 613
			sort(col, index);
614 614
			StatusLine.setMessage(""); //$NON-NLS-1$
615 615
		}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java (revision 513)
36 36
import org.eclipse.swt.widgets.Control;
37 37
import org.eclipse.swt.widgets.Shell;
38 38
import org.eclipse.swt.widgets.Text;
39
import org.txm.rcp.Messages;
39
import org.txm.rcp.RCPMessages;
40 40
import org.txm.rcp.swt.dialog.ObjectSelectionDialog;
41 41
// TODO: Auto-generated Javadoc
42 42
/**
......
79 79
	@Override
80 80
	protected void configureShell(Shell shell) {
81 81
	      super.configureShell(shell);
82
	      shell.setText(Messages.MergeDeleteDialog_1);
82
	      shell.setText(RCPMessages.MergeDeleteDialog_1);
83 83
	   }
84 84

  
85 85

  
......
91 91
		super.createDialogArea(parent);
92 92

  
93 93
		mergeRadio = new Button(mainArea, SWT.RADIO);
94
		mergeRadio.setText(Messages.MergeDeleteDialog_0);
94
		mergeRadio.setText(RCPMessages.MergeDeleteDialog_0);
95 95
		mergeRadio.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false,
96 96
				2, 1));
97 97
		mergeRadio.setSelection(true);
98 98
		
99 99
		deleteRadio = new Button(mainArea, SWT.RADIO);
100
		deleteRadio.setText(Messages.ProgressionDialog_5);
100
		deleteRadio.setText(RCPMessages.ProgressionDialog_5);
101 101
		deleteRadio.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false,
102 102
				2, 1));
103 103
		
104 104
		newname = new Text(mainArea, SWT.SINGLE | SWT.BORDER);
105
		newname.setText(Messages.MergeDeleteDialog_4);
105
		newname.setText(RCPMessages.MergeDeleteDialog_4);
106 106
		newname.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 4,
107 107
				1));
108 108

  
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableDialog.java (revision 513)
45 45
import org.txm.core.messages.TXMCoreMessages;
46 46
import org.txm.core.preferences.TXMPreferences;
47 47
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
48
import org.txm.rcp.Messages;
48
import org.txm.rcp.RCPMessages;
49 49
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
50 50
import org.txm.searchengine.cqp.corpus.Corpus;
51 51
import org.txm.searchengine.cqp.corpus.Property;
......
158 158
			anaPropLabel.setText(mess);
159 159
		else
160 160
			anaPropLabel
161
					.setText(Messages.Property);
161
					.setText(RCPMessages.Property);
162 162
		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
163 163
				false, false));
164 164

  
......
176 176
		anaPropCombo.select(iword);
177 177

  
178 178
		maxlinesLabel = new Label(composite, SWT.NONE);
179
		maxlinesLabel.setText(Messages.NumberOfLines);
179
		maxlinesLabel.setText(RCPMessages.NumberOfLines);
180 180
		maxlinesLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
181 181
				true, false));
182 182
		maxlinesSpinner = new Spinner(composite, SWT.BORDER);
......
207 207
		int propIndex = anaPropCombo.getSelectionIndex();
208 208
		if (propIndex == -1) {
209 209
			MessageDialog.openError(getShell(),
210
					Messages.Invalid_analysis_property,
211
					Messages.Structure_field_not_empty);
210
					RCPMessages.Invalid_analysis_property,
211
					RCPMessages.Structure_field_not_empty);
212 212
			return;
213 213
		}
214 214
		property = properties.get(propIndex);
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java (revision 513)
57 57
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
58 58
import org.txm.lexicaltable.rcp.editors.LexicalTableEditorInput;
59 59
import org.txm.rcp.JobsTimer;
60
import org.txm.rcp.Messages;
60
import org.txm.rcp.RCPMessages;
61 61
import org.txm.rcp.StatusLine;
62 62
import org.txm.rcp.handlers.BaseAbstractHandler;
63 63
import org.txm.rcp.utils.JobHandler;
......
116 116
		if (s instanceof Index) {
117 117
			List<Index> vocabularies = selection.toList();
118 118

  
119
			System.out.println(Messages.ComputeLexicalTable_3);
119
			System.out.println(RCPMessages.ComputeLexicalTable_3);
120 120
			ArrayList<String> choices = new ArrayList<String>();
121
			choices.add(Messages.ComputeLexicalTable_16);
122
			choices.add(Messages.ComputeLexicalTable_12);
121
			choices.add(RCPMessages.ComputeLexicalTable_16);
122
			choices.add(RCPMessages.ComputeLexicalTable_12);
123 123
			ListDialog dialog = new ListDialog(window.getShell());
124 124
			dialog.setInput(choices);
125 125
			dialog.setLabelProvider(new LabelProvider());
126 126
			dialog.setContentProvider(new ArrayContentProvider());
127
			dialog.setTitle(Messages.ComputeLexicalTable_13);
127
			dialog.setTitle(RCPMessages.ComputeLexicalTable_13);
128 128

  
129 129
			int ret = dialog.open();
130 130
			boolean useAllOccurrences = false;
......
134 134
				if(dialog.getResult().length == 0)
135 135
					return null;
136 136
				String sel = (String) dialog.getResult()[0];
137
				if(sel.equals(Messages.ComputeLexicalTable_16))
137
				if(sel.equals(RCPMessages.ComputeLexicalTable_16))
138 138
					useAllOccurrences = true;
139 139
			} else {
140 140
				//System.out.println("cancel");
......
165 165
	private void computeWithLexicalTableAble(final LexicalTable lexicalTableAble) {
166 166

  
167 167
		JobHandler jobhandler = new JobHandler(
168
				Messages.ComputeLexicalTable_0) {
168
				RCPMessages.ComputeLexicalTable_0) {
169 169
			@Override
170 170
			protected IStatus run(IProgressMonitor monitor) {
171 171
				this.runInit(monitor);
172 172
				try {
173 173
					JobsTimer.start();
174
					monitor.beginTask(NLS.bind(Messages.ComputeLexicalTable_1, lexicalTableAble.getName(), "none"), 100);
174
					monitor.beginTask(NLS.bind(RCPMessages.ComputeLexicalTable_1, lexicalTableAble.getName(), "none"), 100);
175 175

  
176 176
					this.acquireSemaphore();
177 177
					//table = lexicalTableAble.toLexicalTable();
......
191 191
							IWorkbenchPage page = window.getActivePage();
192 192
							LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
193 193
							try {
194
								StatusLine.setMessage(Messages.ComputeLexicalTable_10);
194
								StatusLine.setMessage(RCPMessages.ComputeLexicalTable_10);
195 195
								page.openEditor(editorInput, LexicalTableEditor2.ID);
196 196
							} catch (PartInitException e) {
197 197
								org.txm.rcp.utils.Logger.printStackTrace(e);
......
242 242
		final int Fmin;
243 243
		final int vmax;
244 244
		
245
		String title = Messages.bind(Messages.ComputeLexicalTable_0, partition.getName());
245
		String title = RCPMessages.bind(RCPMessages.ComputeLexicalTable_0, partition.getName());
246 246
		LexicalTableDialog d = new LexicalTableDialog(window.getShell(), partition.getCorpus(), title);
247 247
		
248 248
		d.setFminAndVMax(TXMPreferences.getInt(LexicalTablePreferences.F_MIN, LexicalTablePreferences.PREFERENCES_NODE), 
......
254 254
			vmax = d.getMaxLines();
255 255
			// PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(CorporaView.ID);
256 256
			JobHandler jobhandler = new JobHandler(
257
					Messages.bind(Messages.ComputeLexicalTable_0, partition.getName())) {
257
					RCPMessages.bind(RCPMessages.ComputeLexicalTable_0, partition.getName())) {
258 258
				@Override
259 259
				protected IStatus run(IProgressMonitor monitor) {
260 260
					this.runInit(monitor);
261 261
					try {
262 262
						JobsTimer.start();
263
						monitor.beginTask(NLS.bind(Messages.ComputeLexicalTable_1, partition.getName(), property), 100);
263
						monitor.beginTask(NLS.bind(RCPMessages.ComputeLexicalTable_1, partition.getName(), property), 100);
264 264

  
265 265
						this.acquireSemaphore();
266 266
						table = LexicalTableFactory.getLexicalTable(partition, property, Fmin);
......
286 286
								IWorkbenchPage page = window.getActivePage();
287 287
								LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
288 288
								try {
289
									StatusLine.setMessage(Messages.ComputeLexicalTable_10);
289
									StatusLine.setMessage(RCPMessages.ComputeLexicalTable_10);
290 290
									page.openEditor(editorInput, LexicalTableEditor2.ID); //$NON-NLS-1$
291 291
								} catch (PartInitException e) {
292 292
									org.txm.rcp.utils.Logger.printStackTrace(e);
......
435 435
		final List<Index> vocabularies = fullvocabularies.subList(0, 1);
436 436
		for (Index voc : vocabularies) {
437 437
			if (!voc.isComputedWithPartition()) {
438
				System.out.println(Messages.ComputeLexicalTable_5);
439
				StatusLine.setMessage(Messages.ComputeLexicalTable_5);
438
				System.out.println(RCPMessages.ComputeLexicalTable_5);
439
				StatusLine.setMessage(RCPMessages.ComputeLexicalTable_5);
440 440
				return false;
441 441
			}
442 442
		}
......
444 444
		List<Property> properties = vocabularies.get(0).getProperties();
445 445
		for (Index voc : vocabularies) {
446 446
			if (!properties.equals(voc.getProperties())) {
447
				Log.warning(NLS.bind(Messages.ComputeLexicalTable_6, properties));
447
				Log.warning(NLS.bind(RCPMessages.ComputeLexicalTable_6, properties));
448 448
				return false;
449 449
			}
450 450
		}
......
453 453
		Partition firstPartition = firstIndex.getPartition();
454 454
		for (Index voc : vocabularies) {
455 455
			if (!firstPartition.equals(voc.getPartition())) {
456
				Log.warning(NLS.bind(Messages.ComputeLexicalTable_7, firstPartition));
456
				Log.warning(NLS.bind(RCPMessages.ComputeLexicalTable_7, firstPartition));
457 457
				return false;
458 458
			}
459 459
		}
460 460
		
461 461
		final Property property = properties.get(0);
462 462

  
463
		JobHandler jobhandler = new JobHandler(Messages.bind(Messages.ComputeLexicalTable_0, firstIndex.getName())) {
463
		JobHandler jobhandler = new JobHandler(RCPMessages.bind(RCPMessages.ComputeLexicalTable_0, firstIndex.getName())) {
464 464
			@Override
465 465
			protected IStatus run(IProgressMonitor monitor) {
466 466
				this.runInit(monitor);
......
476 476
					firstIndex.addResult(table);
477 477
					monitor.worked(5);
478 478

  
479
					monitor.subTask(Messages.ComputeLexicalTable_10);
479
					monitor.subTask(RCPMessages.ComputeLexicalTable_10);
480 480
					syncExec(new Runnable() {
481 481
						@Override
482 482
						public void run() {
483 483
							IWorkbenchPage page = window.getActivePage();
484 484
							LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
485 485
							try {
486
								StatusLine.setMessage(Messages.ComputeLexicalTable_10);
486
								StatusLine.setMessage(RCPMessages.ComputeLexicalTable_10);
487 487
								page.openEditor(editorInput,
488 488
										"org.txm.rcp.editors.lexicaltable.LexicalTableEditor"); //$NON-NLS-1$
489 489
							} catch (PartInitException e) {
......
496 496
					if (monitor.isCanceled())
497 497
						return Status.CANCEL_STATUS;
498 498

  
499
					monitor.subTask(Messages.ComputeSpecifities_2);
499
					monitor.subTask(RCPMessages.ComputeSpecifities_2);
500 500
					syncExec(new Runnable() {
501 501
						@Override
502 502
						public void run() {
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java (revision 513)
41 41
import org.txm.lexicaltable.core.functions.LexicalTable;
42 42
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
43 43
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
44
import org.txm.rcp.Messages;
44
import org.txm.rcp.RCPMessages;
45 45
import org.txm.rcp.StatusLine;
46 46
// TODO: Auto-generated Javadoc
47 47
/**
......
68 68
				return null;
69 69

  
70 70
			String newname = ""; //$NON-NLS-1$
71
			InputDialog d = new InputDialog(shell, Messages.MergeCols_1,
72
					Messages.MergeLines_2, "", null); //$NON-NLS-1$ 
71
			InputDialog d = new InputDialog(shell, RCPMessages.MergeCols_1,
72
					RCPMessages.MergeLines_2, "", null); //$NON-NLS-1$ 
73 73
			if (d.open() == Window.OK)
74 74
				newname = d.getValue();
75 75
			else
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java (revision 513)
37 37
import org.eclipse.ui.IWorkbenchPart;
38 38
import org.eclipse.ui.handlers.HandlerUtil;
39 39
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
40
import org.txm.rcp.Messages;
40
import org.txm.rcp.RCPMessages;
41 41
/**
42 42
 * Allow the user to delete lines in a Lexical Table.
43 43
 * 
......
72 72
			return;
73 73

  
74 74
		if (selection.length == LTeditor.getLexicalTable().getNRows()) {
75
			System.out.println(Messages.DeleteLines_0);
75
			System.out.println(RCPMessages.DeleteLines_0);
76 76
			return;
77 77
		}
78 78

  
......
81 81
			Shell shell = d.getActiveShell();
82 82
			MessageBox messageBox = new MessageBox(shell, SWT.ICON_QUESTION
83 83
					| SWT.YES | SWT.NO);
84
			messageBox.setMessage(Messages.DeleteLines_1);
84
			messageBox.setMessage(RCPMessages.DeleteLines_1);
85 85
			int response = messageBox.open();
86 86
			if (response != SWT.YES)
87 87
				return;
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java (revision 513)
41 41
import org.eclipse.ui.handlers.HandlerUtil;
42 42
import org.txm.lexicaltable.core.functions.LexicalTable;
43 43
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
44
import org.txm.rcp.Messages;
44
import org.txm.rcp.RCPMessages;
45 45
import org.txm.statsengine.core.StatException;
46 46
/**
47 47
 * The Class MergeCols.
......
67 67
				return null;
68 68

  
69 69
			String newname = ""; //$NON-NLS-1$
70
			InputDialog d = new InputDialog(shell, Messages.MergeCols_1,
71
					Messages.MergeCols_2, "", null); //$NON-NLS-1$ 
70
			InputDialog d = new InputDialog(shell, RCPMessages.MergeCols_1,
71
					RCPMessages.MergeCols_2, "", null); //$NON-NLS-1$ 
72 72
			if (d.open() == Window.OK)
73 73
				newname = d.getValue();
74 74
			else
......
102 102
			// reset col name
103 103
			table.getColNames().setString(selectedCols[0], newname);
104 104
			try {
105
				System.out.println(NLS.bind(Messages.MergeCols_5
105
				System.out.println(NLS.bind(RCPMessages.MergeCols_5
106 106
						, Arrays.toString(table.getRowNames().asStringsArray())));
107 107
			} catch (StatException e1) {
108 108
				// TODO Auto-generated catch block
109 109
				org.txm.rcp.utils.Logger.printStackTrace(e1);
110 110
			}
111 111
			;
112
			System.out.println(Messages.MergeCols_6);
112
			System.out.println(RCPMessages.MergeCols_6);
113 113
			LTeditor.refreshTable();
114 114
		}
115 115
		return null;
tmp/org.txm.internalview.rcp/.classpath (revision 513)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3 3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
5
		<accessrules>
6
			<accessrule kind="accessible" pattern="**"/>
7
		</accessrules>
8
	</classpathentry>
5 9
	<classpathentry kind="src" path="src"/>
6 10
	<classpathentry kind="output" path="bin"/>
7 11
</classpath>
tmp/org.txm.internalview.rcp/src/org/txm/internal/rcp/editors/InternalViewEditor.java (revision 513)
263 263

  
264 264
		Button ok = new Button(formPanel, SWT.PUSH);
265 265
		ok.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
266
		ok.setText(org.txm.rcp.Messages.REFRESH);
266
		ok.setText(org.txm.rcp.RCPMessages.REFRESH);
267 267
		ok.addSelectionListener(new SelectionListener() {
268 268
			@Override
269 269
			public void widgetSelected(SelectionEvent e) {
tmp/org.txm.internalview.rcp/src/org/txm/rcp/internal/rcp/handler/ComputeInternalView.java (revision 513)
70 70

  
71 71
		IWorkbenchPage page = window.getActivePage();
72 72
		try {
73
			StatusLine.setMessage(org.txm.rcp.Messages.OK);
73
			StatusLine.setMessage(org.txm.rcp.RCPMessages.OK);
74 74
			page.openEditor(editorInput, InternalViewEditor.ID); //$NON-NLS-1$
75 75
		
76 76
		} catch (PartInitException e) {
77
			System.err.println(org.txm.rcp.Messages.OK+ e);
77
			System.err.println(org.txm.rcp.RCPMessages.OK+ e);
78 78
		}
79 79

  
80 80
		return null;
tmp/org.txm.annotation.rcp/.classpath (revision 513)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3 3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
5
		<accessrules>
6
			<accessrule kind="accessible" pattern="**"/>
7
		</accessrules>
8
	</classpathentry>
5 9
	<classpathentry kind="src" path="src"/>
6 10
	<classpathentry kind="output" path="bin"/>
7 11
</classpath>
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/views/knowledgerepositories/KRView.java (revision 513)
78 78
import org.txm.annotation.rcp.commands.krview.Informations;
79 79
import org.txm.annotation.rcp.commands.krview.Reload;
80 80
import org.txm.rcp.IImageKeys;
81
import org.txm.rcp.Messages;
81
import org.txm.rcp.RCPMessages;
82 82
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
83 83
import org.txm.searchengine.cqp.corpus.CorpusManager;
84 84
import org.txm.searchengine.cqp.corpus.MainCorpus;
......
238 238
				return ((AnnotationType) element).getId()+((AnnotationType) element).getEffect().toSuffix();
239 239
			else if (element instanceof TypedValue)
240 240
				return ((TypedValue) element).getStandardName();
241
			return NLS.bind(Messages.QueriesView_10, element);
241
			return NLS.bind(RCPMessages.QueriesView_10, element);
242 242
		}
243 243

  
244 244
		/* (non-Javadoc)
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/ExportStandoff.java (revision 513)
45 45
import org.txm.annotation.core.AnnotationManager;
46 46
import org.txm.annotation.core.KRAnnotationEngine;
47 47
import org.txm.core.preferences.TBXPreferences;
48
import org.txm.rcp.Messages;
48
import org.txm.rcp.RCPMessages;
49 49
import org.txm.rcp.StatusLine;
50 50
import org.txm.rcp.swt.dialog.LastOpened;
51 51
import org.txm.rcp.utils.JobHandler;
......
86 86
		dialog.setFileName(corpus.getName()+"_annotations.zip");
87 87
		dialog.setFilterExtensions(new String[]{"*.zip"});
88 88
		if (dialog.open() != null) {
89
			StatusLine.setMessage(Messages.ExportAnnotation_0);
89
			StatusLine.setMessage(RCPMessages.ExportAnnotation_0);
90 90
			String filepath = dialog.getFilterPath();
91 91
			String filename = dialog.getFileName();
92 92

  
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/commands/SaveAnnotations.java (revision 513)
14 14
import org.eclipse.ui.handlers.HandlerUtil;
15 15
import org.txm.annotation.core.AnnotationManager;
16 16
import org.txm.annotation.core.KRAnnotationEngine;
17
import org.txm.rcp.Messages;
17
import org.txm.rcp.RCPMessages;
18 18
import org.txm.rcp.commands.CloseEditorsUsing;
19 19
import org.txm.rcp.commands.workspace.UpdateCorpus;
20 20
import org.txm.rcp.utils.JobHandler;
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/preferences/AnnotationPreferencePage.java (revision 513)
31 31
import org.eclipse.ui.IWorkbench;
32 32
import org.txm.annotation.core.preferences.AnnotationPreferences;
33 33
import org.txm.rcp.IImageKeys;
34
import org.txm.rcp.Messages;
34
import org.txm.rcp.RCPMessages;
35 35
import org.txm.rcp.preferences.RCPPreferences;
36 36
import org.txm.rcp.preferences.RCPPreferencesPage;
37 37
import org.txm.rcp.preferences.TXMPreferencePage;
......
72 72
		addField(mode_expert);*/
73 73
		
74 74
		String[][] labelAndValues = {
75
				{Messages.AnnotationPreferences_1, "simple"},
76
				{Messages.AnnotationPreferences_2, "advanced"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
75
				{RCPMessages.AnnotationPreferences_1, "simple"},
76
				{RCPMessages.AnnotationPreferences_2, "advanced"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
77 77
		
78
		mode_annotation = new RadioGroupFieldEditor(AnnotationPreferences.ANNOTATION_MODE, Messages.AnnotationPreferences_0, 2, labelAndValues, getFieldEditorParent());
78
		mode_annotation = new RadioGroupFieldEditor(AnnotationPreferences.ANNOTATION_MODE, RCPMessages.AnnotationPreferences_0, 2, labelAndValues, getFieldEditorParent());
79 79
		addField(mode_annotation);
80 80
		//mode_annotation.setPreferenceStore(store);
81 81
	}
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java (revision 513)
35 35
import org.txm.partition.rcp.messages.PartitionUIMessages;
36 36
import org.txm.rcp.preferences.TXMPreferencePage;
37 37
import org.txm.rcp.preferences.TXMPreferenceStore;
38
import org.txm.rcp.Messages;
38
import org.txm.rcp.RCPMessages;
39 39

  
40 40
/**
41 41
 * Partition preference page.
......
76 76
	public void init(IWorkbench workbench) {
77 77
		this.setPreferenceStore(new TXMPreferenceStore(PartitionDimensionsPreferences.PREFERENCES_NODE));
78 78
		//this.setDescription(Messages.DiagnosticPreferencePage_1);
79
		this.setTitle(Messages.DiagnosticPreferencePage_1);
79
		this.setTitle(RCPMessages.DiagnosticPreferencePage_1);
80 80
	}
81 81

  
82 82

  
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java (revision 513)
37 37
import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
38 38
import org.txm.cooccurrence.rcp.editors.CooccurrencesEditor;
39 39
import org.txm.core.preferences.TXMPreferences;
40
import org.txm.rcp.Messages;
40
import org.txm.rcp.RCPMessages;
41 41
import org.txm.rcp.StatusLine;
42 42
import org.txm.rcp.editors.TXMEditorPart;
43 43
import org.txm.rcp.editors.TXMResultEditorInput;
......
129 129
		} else if (selection instanceof Cooccurrence) { // reopening an existing result
130 130
			cooc = (Cooccurrence)selection;
131 131
		} else {
132
			System.out.println(Messages.ComputeCooccurrences_1 + selection);
132
			System.out.println(RCPMessages.ComputeCooccurrences_1 + selection);
133 133
			return null;
134 134
		}
135 135
		
136 136
		try {
137
			StatusLine.setMessage(Messages.ComputeCooccurrences_0);
137
			StatusLine.setMessage(RCPMessages.ComputeCooccurrences_0);
138 138

  
139 139
			//System.out.println("DEBUG: opening cooc: "+cooc+" corpus="+cooc.getCorpus());
140 140
			editorInput = new TXMResultEditorInput(cooc);
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java (revision 513)
84 84
import org.txm.core.preferences.TXMPreferences;
85 85
import org.txm.core.results.TXMParameters;
86 86
import org.txm.rcp.JobsTimer;
87
import org.txm.rcp.Messages;
87
import org.txm.rcp.RCPMessages;
88 88
import org.txm.rcp.StatusLine;
89 89
import org.txm.rcp.editors.TXMEditorPart;
90 90
import org.txm.rcp.editors.TXMResultEditorInput;
......
109 109
 * @author mdecorde
110 110
 */
111 111
public class CooccurrencesEditor extends TXMEditorPart {
112
	
112

  
113 113
	/** The Constant ID. */
114 114
	public static final String ID = CooccurrencesEditor.class.getName(); //$NON-NLS-1$
115 115

  
116 116
	/** The cooc. */
117 117
	Cooccurrence cooc;
118
	
118

  
119 119
	/** The self. */
120 120
	CooccurrencesEditor self;
121 121
	// params
122 122
	/** The query widget. */
123 123
	AssistedQueryWidget queryWidget;
124
	
124

  
125 125
	/** The props area. */
126 126
	PropertiesSelector propsArea;
127
	
127

  
128 128
	/** The empant panel. */
129 129
	EmpantWidget empantPanel;
130
	
130

  
131 131
	/** The T score. */
132 132
	Text TScore;
133
	
133

  
134 134
	/** The T count. */
135 135
	Spinner TCount;
136
	
136

  
137 137
	/** The T freq. */
138 138
	Spinner TFreq;
139 139

  
140 140
	/** The line table viewer. */
141 141
	TableViewer viewer;
142
	
142

  
143 143
	/** The n column. */
144 144
	TableColumn nColumn;
145
	
145

  
146 146
	/** The occ column. */
147 147
	TableColumn occColumn;
148
	
148

  
149 149
	/** The freq column. */
150 150
	TableColumn freqColumn;
151
	
151

  
152 152
	/** The nbocc column. */
153 153
	TableColumn nboccColumn;
154
	
154

  
155 155
	/** The score column. */
156 156
	TableColumn scoreColumn;
157
	
157

  
158 158
	/** The dist column. */
159 159
	TableColumn distColumn;
160 160

  
......
197 197
	 */
198 198
	@Override
199 199
	public void createPartControl(final Composite parent) {
200
		
200

  
201 201
		// FIXME: to do
202 202
		//super.createPartControl(parent);
203
		
203

  
204 204
		FormLayout parentLayout = new FormLayout();
205 205
		parent.setLayout(parentLayout);
206 206

  
......
347 347
		TCount.setMaximum(99999);
348 348
		TCount.setIncrement(1);
349 349
		TCount.setPageIncrement(100);
350
		
350

  
351 351
		seuilLabel = new Label(filtercontrols, SWT.NONE);
352 352
		seuilLabel.setText(CooccurrenceUIMessages.CooccurrencesEditor_6);
353 353
		TScore = new Text(filtercontrols, SWT.BORDER);
354
		
354

  
355 355
		// empant
356 356
		empantPanel = new EmpantWidget(paramArea, SWT.NONE, this.getCorpus());
357
		
357

  
358 358
		FormData empantLayoutData = new FormData();
359 359
		empantLayoutData.top = new FormAttachment(filtercontrols, 0);
360 360
		empantLayoutData.bottom = new FormAttachment(100);
361 361
		empantLayoutData.left = new FormAttachment(0);
362 362
		empantLayoutData.right = new FormAttachment(100);
363 363
		empantPanel.setLayoutData(empantLayoutData);
364
		
364

  
365 365
		// result
366 366
		Composite resultArea = new Composite(parent, SWT.NONE);
367 367
		FormData resultLayoutData = new FormData();
......
379 379
		viewer.getTable().addKeyListener(new TableKeyListener(viewer));
380 380
		viewer.getTable().setLinesVisible(true);
381 381
		viewer.getTable().setHeaderVisible(true);
382
		
382

  
383 383
		String fontName = cooc.getCorpus().getFont();
384 384
		if (fontName != null && fontName.length() > 0) {
385 385
			Font old = viewer.getTable().getFont();
......
389 389
			viewer.getTable().setFont(font);
390 390
		}
391 391

  
392
//TODO replace this with a command+menucontribution		
393
//		viewer.getTable().addMouseListener(new MouseAdapter() {
394
//			@Override
395
//			public void mouseDoubleClick(MouseEvent e) {
396
//				Point mouseposition = new Point(e.x
397
//						+ viewer.getTable().getHorizontalBar()
398
//						.getSelection(), e.y);
399
//				int col = getPointedColumn(mouseposition);
400
//				//System.out.println("col "+col);
401
//				switch(col)
402
//				{
403
//				default:
404
//					IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
405
//					CooccurrencesToConcordances.link(CooccurrencesEditor.this, selection);
406
//				}
407
//			}
408
//		});
392
		//TODO replace this with a command+menucontribution		
393
		//		viewer.getTable().addMouseListener(new MouseAdapter() {
394
		//			@Override
395
		//			public void mouseDoubleClick(MouseEvent e) {
396
		//				Point mouseposition = new Point(e.x
397
		//						+ viewer.getTable().getHorizontalBar()
398
		//						.getSelection(), e.y);
399
		//				int col = getPointedColumn(mouseposition);
400
		//				//System.out.println("col "+col);
401
		//				switch(col)
402
		//				{
403
		//				default:
404
		//					IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
405
		//					CooccurrencesToConcordances.link(CooccurrencesEditor.this, selection);
406
		//				}
407
		//			}
408
		//		});
409 409

  
410 410
		FormData tableLayoutData = new FormData();
411 411
		tableLayoutData.top = new FormAttachment(0);
......
438 438
		});
439 439

  
440 440
		freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
441
		freqColumn.setText(Messages.FrequencyListEditorInput_4);
442
		freqColumn.setToolTipText(Messages.FrequencyListEditorInput_4);
441
		freqColumn.setText(RCPMessages.FrequencyListEditorInput_4);
442
		freqColumn.setToolTipText(RCPMessages.FrequencyListEditorInput_4);
443 443
		freqColumn.setWidth(100);
444 444
		freqColumn.addSelectionListener(new SelectionListener() {
445 445
			@Override
......
561 561
	 * @return
562 562
	 */
563 563
	public TXMParameters getWidgetsParameters()	{
564
		
564

  
565 565
		TXMParameters parameters = new TXMParameters();
566 566
		parameters.put(CooccurrencePreferences.QUERY, this.queryWidget.getQueryString());
567 567
		parameters.put(CooccurrencePreferences.PROPERTIES, this.propsArea.getProperties());
......
574 574
		parameters.put(CooccurrencePreferences.MIN_COUNT, this.TCount.getSelection());
575 575
		parameters.put(CooccurrencePreferences.INCLUDE_X_PIVOT, this.empantPanel.getXPivot());
576 576
		parameters.put(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE,this.getBooleanParameterValue(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE));
577
		
577

  
578 578
		Double minScore = 0.0;
579 579
		try {
580 580
			Double d = Double.parseDouble(this.TScore.getText());
......
582 582
		} catch (Exception e) {
583 583
			System.out.println(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_18, this.TScore.getText()));
584 584
		}
585
		
585

  
586 586
		parameters.put(CooccurrencePreferences.MIN_SCORE, minScore);
587
		
587

  
588 588
		return parameters;
589 589
	}
590 590

  
......
594 594
		if (this.queryWidget.getQueryString().trim().length() == 0 || this.queryWidget.getQueryString().trim().equals("\"\"")) //$NON-NLS-1$
595 595
			return;
596 596
		queryWidget.memorize();
597
		
597

  
598 598
		if (this.empantPanel.getMinLeft() == -1 && this.empantPanel.getMinRight() == -1) {
599 599
			if (this.empantPanel.getStruct() == null) {
600 600
				System.out.println(CooccurrenceUIMessages.CooccurrencesEditor_16);
......
604 604
				return;
605 605
			}
606 606
		}
607
		
607

  
608 608
		// FIXME: method using TXMCommandParameters
609 609
		final TXMParameters parameters = this.getWidgetsParameters();
610
		
610

  
611 611
		JobHandler jobhandler = new JobHandler(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_12, cooc.getCorpus())) {
612 612
			@Override
613 613
			protected IStatus run(IProgressMonitor monitor) {
......
618 618
					//FIXME: Debug
619 619
					//System.out.println("cooc: "+corpus+" "+query+" "+properties+" "+structure+" "+leftmax+" "+leftmin+" "+rightmin+" "+rightmax+" "+minfreq+" "+mincount+" "+minscore+" "+includeXpivot);
620 620
					//monitor.worked(5);
621
					
621

  
622 622
					cooc.setParameters(parameters);
623 623
					if (cooc.validateParameters() && cooc.isDirty()) {
624 624
						cooc.compute(this);
625 625
					}
626
					
626

  
627 627
					//FIXME: DEbug
628
//					parameters.dump();
629
//					TXMPreferences.dump(CooccurrencePreferences.PREFERENCES_NODE, cooc);
630
					
628
					//					parameters.dump();
629
					//					TXMPreferences.dump(CooccurrencePreferences.PREFERENCES_NODE, cooc);
630

  
631 631
					// FIXME: this code should be move in Cooccurrence.getDetails() or getName(), etc?
632 632
					final String message;
633 633
					if (cooc.getLines().size() == 0) {
......
639 639
					else {
640 640
						message = (CooccurrenceUIMessages.bind(CooccurrenceUIMessages.CooccurrencesEditor_34, cooc.getNumberOfKeyword(), cooc.getNumberOfDifferentCooccurrents()));
641 641
					}
642
					
642

  
643 643
					System.out.println(message);
644 644
					this.syncExec(new Runnable() {
645 645
						@Override
......
648 648
							try { txt += ", T "+cooc.getCorpus().getSize();} //$NON-NLS-1$
649 649
							catch(Exception e) {System.out.println(CooccurrenceUIMessages.CooccurrencesEditor_25);}
650 650
							String tooltip = "- " + txt.replaceAll(", ", "\n- "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
651
							
651

  
652 652
							empantPanel.setInfo(txt, tooltip);
653 653
							StatusLine.setMessage(message);
654 654
						}
......
665 665
					Logger.severe(CooccurrenceUIMessages.CooccurrencesEditor_1  + " " + Logger.toString(e)); //$NON-NLS-1$
666 666
					e.printStackTrace();
667 667
					try {
668
						Logger.info(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
668
						Logger.info(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
669 669
					}
670 670
					catch (Exception e2) {
671
						Logger.severe(Messages.ConcordancesEditor_7+e2);
671
						Logger.severe("Error: "+e2.getLocalizedMessage()); //$NON-NLS-1$
672 672
						org.txm.rcp.utils.Logger.printStackTrace(e);
673 673
					}
674
					
674

  
675 675
					return Status.CANCEL_STATUS;
676 676
				}
677 677
				monitor.worked(5);
......
697 697
						viewer.getControl().setRedraw(true);
698 698

  
699 699
						refresh();
700
						
700

  
701 701
						//FIXME: need to be done in another way with after the plugin split
702 702
						QueriesView.refresh();
703 703
						RVariablesView.refresh();
704
						
704

  
705 705
						viewer.getTable().setFocus();
706 706
					}
707 707
				});
......
720 720
	 */
721 721
	protected void initializeFields() {
722 722
		queryWidget.setText(this.getStringParameterValue(CooccurrencePreferences.QUERY));
723
		
723

  
724 724
		if (this.cooc.getProperties() != null) {
725 725
			List<Property> available;
726 726
			try {
......
732 732
				org.txm.rcp.utils.Logger.printStackTrace(e);
733 733
			}
734 734
		}
735
		
735

  
736 736
		TFreq.setSelection(this.getIntParameterValue(CooccurrencePreferences.MIN_FREQ));
737 737
		TCount.setSelection(this.getIntParameterValue(CooccurrencePreferences.MIN_COUNT));
738 738

  
739 739
		TScore.setText(""+this.getDoubleParameterValue(CooccurrencePreferences.MIN_SCORE));
740
		
740

  
741 741
		empantPanel.setMinLeft(this.getIntParameterValue(CooccurrencePreferences.MIN_LEFT)-1);
742 742
		empantPanel.setMaxLeft(this.getIntParameterValue(CooccurrencePreferences.MAX_LEFT)-1);
743 743
		empantPanel.setMinRight(this.getIntParameterValue(CooccurrencePreferences.MIN_RIGHT)-1);
......
800 800
	public Cooccurrence getCooc() {
801 801
		return this.cooc;
802 802
	}
803
	
803

  
804 804
	/**
805 805
	 * Do save.
806 806
	 *
......
822 822

  
823 823
	}
824 824

  
825
	
826
	
825

  
826

  
827 827
	/**
828 828
	 * Checks if is dirty.
829 829
	 *
......
859 859
						new IRunnableWithProgress() {
860 860
							@Override
861 861
							public void run(IProgressMonitor monitor)
862
							throws InvocationTargetException,
863
							InterruptedException {
862
									throws InvocationTargetException,
863
									InterruptedException {
864 864
								try {
865 865
									cooc.sort(currentComparator);
866 866
								} catch (CqiClientException e) {
867
									System.err.println(NLS.bind(
868
										Messages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
867
									System.err.println("Error: "+e.getLocalizedMessage());
869 868
								}
870 869
							}
871 870
						});
872 871
			} catch (Exception e) {
873
				System.err.println(NLS.bind(
874
						Messages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
872
				System.err.println("Error: "+e.getLocalizedMessage());
875 873
				org.txm.rcp.utils.Logger.printStackTrace(e);
876 874
			}
877 875
			viewer.refresh();
tmp/org.txm.internalview.core/.classpath (revision 513)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3 3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
5
		<accessrules>
6
			<accessrule kind="accessible" pattern="**"/>
7
		</accessrules>
8
	</classpathentry>
5 9
	<classpathentry kind="src" path="src"/>
6 10
	<classpathentry kind="output" path="bin"/>
7 11
</classpath>
tmp/org.txm.links.rcp/.classpath (revision 513)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<classpath>
3 3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
5
		<accessrules>
6
			<accessrule kind="accessible" pattern="**"/>
7
		</accessrules>
8
	</classpathentry>
5 9
	<classpathentry kind="src" path="src"/>
6 10
	<classpathentry kind="output" path="bin"/>
7 11
</classpath>
tmp/org.txm.links.rcp/META-INF/MANIFEST.MF (revision 513)
33 33
 org.txm.rcp,
34 34
 org.txm.index.rcp,
35 35
 org.txm.progression.rcp,
36
 org.txm.lexicaltable.rcp
36
 org.txm.lexicaltable.rcp,
37
 org.txm.libs.batik
37 38
Export-Package: org.txm.rcp.commands.link
tmp/org.txm.links.rcp/src/ComputeIndexFromLines.java (revision 513)
33 33
import org.eclipse.ui.IWorkbenchWindow;
34 34
import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
35 35
import org.txm.concordance.rcp.editors.ConcordanceEditor;
36
import org.txm.rcp.Messages;
36
import org.txm.rcp.RCPMessages;
37 37
import org.txm.rcp.commands.link.ConcordanceToIndex;
38 38

  
39 39
// TODO: Auto-generated Javadoc
......
62 62
		this.window = window;
63 63
		this.concordanceEditor = concordanceEditor;
64 64
		setId(ID);
65
		setText(Messages.ComputeIndexFromLines_0);
66
		setToolTipText(Messages.ComputeIndexFromLines_0);
65
		setText(RCPMessages.ComputeIndexFromLines_0);
66
		setToolTipText(RCPMessages.ComputeIndexFromLines_0);
67 67
	}
68 68

  
69 69
	/* (non-Javadoc)
tmp/org.txm.links.rcp/src/org/txm/links/rcp/ComputeIndexFromLines.java (revision 513)
33 33
import org.eclipse.ui.IWorkbenchWindow;
34 34
import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
35 35
import org.txm.concordance.rcp.editors.ConcordanceEditor;
36
import org.txm.rcp.Messages;
36
import org.txm.rcp.RCPMessages;
37 37
import org.txm.rcp.commands.link.ConcordanceToIndex;
38 38

  
39 39
// TODO: Auto-generated Javadoc
......
62 62
		this.window = window;
63 63
		this.concordanceEditor = concordanceEditor;
64 64
		setId(ID);
65
		setText(Messages.ComputeIndexFromLines_0);
66
		setToolTipText(Messages.ComputeIndexFromLines_0);
65
		setText(RCPMessages.ComputeIndexFromLines_0);
66
		setToolTipText(RCPMessages.ComputeIndexFromLines_0);
67 67
	}
68 68

  
69 69
	/* (non-Javadoc)
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/CooccurrencesToConcordances.java (revision 513)
44 44
import org.txm.cooccurrence.core.functions.Cooccurrence;
45 45
import org.txm.cooccurrence.core.functions.Cooccurrence.CLine;
46 46
import org.txm.cooccurrence.rcp.editors.CooccurrencesEditor;
47
import org.txm.rcp.Messages;
47
import org.txm.rcp.RCPMessages;
48 48
import org.txm.rcp.editors.TXMResultEditorInput;
49 49
import org.txm.searchengine.cqp.corpus.Corpus;
50 50
import org.txm.searchengine.cqp.corpus.Property;
......
130 130
			ConcordanceEditor conceditor = (ConcordanceEditor) page
131 131
					.openEditor(editorInput, ConcordanceEditor.ID); //$NON-NLS-1$
132 132
		} catch (PartInitException e) {
133
			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
133
			System.err.println("Error: "+e.getLocalizedMessage());
134 134
		}
135 135
	}
136 136
}
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToLexicalTable.java (revision 513)
48 48
import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
49 49
import org.txm.lexicaltable.rcp.editors.LexicalTableEditorInput;
50 50
import org.txm.rcp.handlers.BaseAbstractHandler;
51
import org.txm.rcp.Messages;
51
import org.txm.rcp.RCPMessages;
52 52
import org.txm.rcp.StatusLine;
53 53
import org.txm.statsengine.r.core.data.QuantitativeDataStructureImpl;
54 54
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
......
95 95

  
96 96
		if (!voc.isComputedWithPartition()) {
97 97
			
98
			System.out.println(Messages.IndexToLexicalTable_0);
99
			StatusLine.setMessage(Messages.IndexToLexicalTable_0);
98
			System.out.println(RCPMessages.IndexToLexicalTable_0);
99
			StatusLine.setMessage(RCPMessages.IndexToLexicalTable_0);
100 100
			return false;
101 101
		}
102 102

  
103
		System.out.println(Messages.ComputeLexicalTable_3);
103
		System.out.println(RCPMessages.ComputeLexicalTable_3);
104 104
		ArrayList<String> choices = new ArrayList<String>();
105
		choices.add(Messages.ComputeLexicalTable_16);
106
		choices.add(Messages.ComputeLexicalTable_12);
105
		choices.add(RCPMessages.ComputeLexicalTable_16);
106
		choices.add(RCPMessages.ComputeLexicalTable_12);
107 107
		ListSelectionDialog dialog = new ListSelectionDialog(shell, 
108 108
				choices, new ArrayContentProvider(), new LabelProvider(), 
109
				Messages.ComputeLexicalTable_13);
109
				RCPMessages.ComputeLexicalTable_13);
110 110
		
111 111
		int ret = dialog.open();
112 112
		//System.out.println("ret= "+ret);
......
130 130
					.getActiveWorkbenchWindow();
131 131
			IWorkbenchPage page = window.getActivePage();
132 132
			LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
133
			StatusLine.setMessage(Messages.ComputeLexicalTable_10);
133
			StatusLine.setMessage(RCPMessages.ComputeLexicalTable_10);
134 134
			page.openEditor(editorInput, "org.txm.rcp.editors.lexicaltable.LexicalTableEditor"); //$NON-NLS-1$
135 135
		} catch (PartInitException e) {
136 136
			org.txm.rcp.utils.Logger.printStackTrace(e);
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/TextToConcordance.java (revision 513)
38 38
import org.eclipse.ui.handlers.HandlerUtil;
39 39
import org.txm.concordance.core.functions.Concordance;
40 40
import org.txm.concordance.rcp.editors.ConcordanceEditor;
41
import org.txm.rcp.Messages;
41
import org.txm.rcp.RCPMessages;
42 42
import org.txm.rcp.editors.IEditionEditor;
43 43
import org.txm.rcp.editors.TXMResultEditorInput;
44 44
import org.txm.searchengine.cqp.corpus.Corpus;
......
86 86
				ConcordanceEditor conceditor = (ConcordanceEditor) page
87 87
						.openEditor(editorInput, "ConcordanceEditor"); //$NON-NLS-1$
88 88
			} catch (PartInitException e) {
89
				System.err.println(NLS.bind(Messages.GetConcordances_4, e));
89
				System.err.println("Error: "+e.getLocalizedMessage());
90 90
			}
91 91
		}
92 92
		return null;
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/ConcordanceToIndex.java (revision 513)
41 41
import org.txm.concordance.rcp.editors.ConcordanceEditor;
42 42
import org.txm.index.core.functions.Index;
43 43
import org.txm.index.rcp.editors.IndexEditor;
44
import org.txm.rcp.Messages;
44
import org.txm.rcp.RCPMessages;
45 45
import org.txm.rcp.editors.TXMResultEditorInput;
46 46
import org.txm.searchengine.cqp.corpus.Corpus;
47 47
import org.txm.searchengine.cqp.corpus.Property;
......
90 90
			voceditor.setFocus(query);
91 91
			voceditor.computeResult();
92 92
		} catch (PartInitException e) {
93
			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
93
			System.err.println("Error: "+e.getLocalizedMessage());
94 94
		}
95 95

  
96 96
		return null;
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToConcordance.java (revision 513)
42 42
import org.txm.concordance.rcp.editors.ConcordanceEditor;
43 43
import org.txm.index.core.functions.Line;
44 44
import org.txm.index.rcp.editors.IndexEditor;
45
import org.txm.rcp.Messages;
45
import org.txm.rcp.RCPMessages;
46 46
import org.txm.rcp.editors.TXMResultEditorInput;
47 47
import org.txm.searchengine.cqp.corpus.Corpus;
48 48
import org.txm.searchengine.cqp.corpus.Property;
......
84 84
			ConcordanceEditor conceditor = (ConcordanceEditor) page
85 85
					.openEditor(editorInput, ConcordanceEditor.ID); //$NON-NLS-1$
86 86
		} catch (PartInitException e) {
87
			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
87
			System.err.println("Error: "+e.getLocalizedMessage());
88 88
		}
89 89

  
90 90
		return null;
......
145 145
			ConcordanceEditor conceditor = (ConcordanceEditor) page
146 146
					.openEditor(editorInput, ConcordanceEditor.ID); //$NON-NLS-1$
147 147
		} catch (PartInitException e) {
148
			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
148
			System.err.println("Error: "+e.getLocalizedMessage());
149 149
		}
150 150

  
151 151
		return null;
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java (revision 513)
67 67
import org.txm.chartsengine.rcp.editors.ChartEditorInput;
68 68
import org.txm.chartsengine.rcp.editors.ChartEditorPart;
69 69
import org.txm.core.results.TXMResult;
70
import org.txm.rcp.Messages;
70
import org.txm.rcp.RCPMessages;
71 71
import org.txm.rcp.editors.SplitedGenericMultiPageEditor;
72 72
import org.txm.rcp.editors.TXMMultiPageEditor;
73 73
import org.txm.rcp.editors.TXMResultEditorInput;
......
186 186

  
187 187

  
188 188
		if (editors.size() != inputs.size()) {
189
			throw new IllegalArgumentException(NLS.bind(Messages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
189
			throw new IllegalArgumentException(NLS.bind(RCPMessages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
190 190
		}
191 191

  
192 192
		// put first editor in the left panel and set is as "main" editor
......
220 220
		}
221 221
		catch (Exception e1) {
222 222
			org.txm.rcp.utils.Logger.printStackTrace(e1);
223
			System.out.println(Messages.CaEditor_0+e1);
223
			System.out.println(RCPMessages.CaEditor_0+e1);
224 224
			return;
225 225
		}
226 226

  
......
231 231
				editorIndex = addPage(editors.get(i), inputs.get(i));
232 232
			} catch (PartInitException e) {
233 233
				org.txm.rcp.utils.Logger.printStackTrace(e);
234
				System.out.println(Messages.CaEditor_0+e);
234
				System.out.println(RCPMessages.CaEditor_0+e);
235 235
				return;
236 236
			}
237 237
			setPageText(editorIndex, names.get(i));
......
352 352
			@Override
353 353
			public String[] getColumnTypes() {
354 354
				return new String[] {
355
						Messages.FrequencyListEditorInput_6,
355
						RCPMessages.FrequencyListEditorInput_6,
356 356
						COL_TYPE,
357 357
						COL_TYPE,
358 358
						COL_TYPE,
......
417 417
			@Override
418 418
			public String[] getColumnTypes() {
419 419
				coltypes = new ArrayList<String>();
420
				coltypes.add(Messages.FrequencyListEditorInput_6);
420
				coltypes.add(RCPMessages.FrequencyListEditorInput_6);
421 421
				coltypes.add(SEPARATOR);
422 422
				coltypes.add(COL_TYPE);
423 423
				coltypes.add(COL_TYPE);
......
501 501
			@Override
502 502
			public String[] getColumnTypes() {
503 503
				coltypes = new ArrayList<String>();
504
				coltypes.add(Messages.FrequencyListEditorInput_6);
504
				coltypes.add(RCPMessages.FrequencyListEditorInput_6);
505 505
				coltypes.add(SEPARATOR);
506 506
				coltypes.add(COL_TYPE);
507 507
				coltypes.add(COL_TYPE);
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java (revision 513)
48 48
import org.eclipse.ui.IEditorSite;
49 49
import org.eclipse.ui.PartInitException;
50 50
import org.eclipse.ui.part.EditorPart;
51
import org.txm.rcp.Messages;
51
import org.txm.rcp.RCPMessages;
52 52
import org.txm.rcp.StatusLine;
53 53
import org.txm.rcp.editors.Tablable;
54 54
import org.txm.rcp.editors.TableKeyListener;
......
132 132
		parent.setLayout(new FillLayout());
133 133

  
134 134
		if (!(iEditorInput instanceof Tablable)) {
135
			throw new IllegalArgumentException(Messages.SingularValuesEditor_0);
135
			throw new IllegalArgumentException(RCPMessages.SingularValuesEditor_0);
136 136
		}
137 137
		tableInput = (Tablable) iEditorInput;
138 138

  
......
168 168
				@Override
169 169
				public void widgetSelected(SelectionEvent e)
170 170
				{
171
					StatusLine.setMessage(Messages.SORT_COLUMN);
171
					StatusLine.setMessage(RCPMessages.SORT_COLUMN);
172 172
					tableSorter.setColumn(index);
173 173
					int dir = viewer.getTable().getSortDirection();
174 174
					if (viewer.getTable().getSortColumn() == column.getColumn()) {
......
179 179
					viewer.getTable().setSortDirection(dir);
180 180
					viewer.getTable().setSortColumn(column.getColumn());
181 181
					viewer.refresh();
182
					StatusLine.setMessage(Messages.SORT_DONE);
182
					StatusLine.setMessage(RCPMessages.SORT_DONE);
183 183
				}
184 184
			});
185 185
		}
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColRowInfosLabelProvider.java (revision 513)
37 37
import org.txm.ca.core.preferences.CAPreferences;
38 38
import org.txm.ca.rcp.messages.CAUIMessages;
39 39
import org.txm.core.preferences.TXMPreferences;
40
import org.txm.rcp.Messages;
40
import org.txm.rcp.RCPMessages;
41 41
// TODO: Auto-generated Javadoc
42 42
/**
43 43
 * The Class ColRowInfosLabelProvider.
......
82 82
				String pattern = TXMPreferences.getString(CAPreferences.MASS_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
83 83
			if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
84 84
					masspattern = new DecimalFormat(pattern);
85
			} else if (names[i].startsWith(Messages.ColRowInfosLabelProvider_9)) {
85
			} else if (names[i].startsWith(RCPMessages.ColRowInfosLabelProvider_9)) {
86 86
				String pattern = TXMPreferences.getString(CAPreferences.CHI_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
87 87
				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
88 88
					chipattern = new DecimalFormat(pattern);
......
103 103
				String pattern = TXMPreferences.getString(CAPreferences.CONTRIB_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
104 104
				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
105 105
					contribpattern = new DecimalFormat(pattern);
106
			} else if (names[i].startsWith(Messages.ColRowInfosLabelProvider_19) && names[i].length() == 3) {
106
			} else if (names[i].startsWith(RCPMessages.ColRowInfosLabelProvider_19) && names[i].length() == 3) {
107 107
				String pattern = TXMPreferences.getString(CAPreferences.QUALITY_DISPLAY_FORMAT, CAPreferences.PREFERENCES_NODE);
108 108
				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
109 109
					qualitypattern = new DecimalFormat(pattern);
......
135 135
			f = new DecimalFormat("###.00"); //$NON-NLS-1$
136 136
			if (name.startsWith(CACoreMessages.mass)) {
137 137
				f = masspattern;
138
			} else if (name.startsWith(Messages.ColRowInfosLabelProvider_9)) {
138
			} else if (name.startsWith(RCPMessages.ColRowInfosLabelProvider_9)) {
139 139
				f = chipattern;
140 140
			} else if (name.startsWith(CACoreMessages.dist)) {
141 141
				f = distpattern;
......
146 146
				f = coordpattern;
147 147
			} else if (name.startsWith(CACoreMessages.cont)) {
148 148
				f = contribpattern;
149
			} else if (name.startsWith(Messages.ColRowInfosLabelProvider_19)
149
			} else if (name.startsWith(RCPMessages.ColRowInfosLabelProvider_19)
150 150
					&& name.length() == 3) {
151 151
				f = qualitypattern;
152 152
			}
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java (revision 513)
45 45
import org.eclipse.ui.IEditorSite;
46 46
import org.eclipse.ui.PartInitException;
47 47
import org.eclipse.ui.part.EditorPart;
48
import org.txm.rcp.Messages;
48
import org.txm.rcp.RCPMessages;
49 49
import org.txm.rcp.StatusLine;
50 50
import org.txm.rcp.editors.Tablable;
51 51
import org.txm.rcp.editors.TableKeyListener;
......
126 126
		parent.setLayout(new FillLayout());
127 127

  
128 128
		if (!(iEditorInput instanceof Tablable)) {
129
			throw new IllegalArgumentException(Messages.ColsRowsInfosEditor_0);
129
			throw new IllegalArgumentException(RCPMessages.ColsRowsInfosEditor_0);
130 130
		}
131 131
		tableInput = (Tablable) iEditorInput;
132 132
		viewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL
......
156 156
			column.getColumn().addSelectionListener(new SelectionAdapter() {
157 157
				@Override
158 158
				public void widgetSelected(SelectionEvent e) {
159
					StatusLine.setMessage(Messages.SORT_COLUMN );
159
					StatusLine.setMessage(RCPMessages.SORT_COLUMN );
160 160
					tableSorter.setColumn(index);
161 161
					int dir = viewer.getTable().getSortDirection();
162 162
					if (viewer.getTable().getSortColumn() == column.getColumn()) {
......
167 167
					viewer.getTable().setSortDirection(dir);
168 168
					viewer.getTable().setSortColumn(column.getColumn());
169 169
					viewer.refresh();
170
					StatusLine.setMessage(Messages.SORT_DONE);
170
					StatusLine.setMessage(RCPMessages.SORT_DONE);
171 171
				}
172 172
			});
173 173
		}
......
180 180
		tableSorter.setColumnTypes(tableInput.getColumnTypes());
181 181
		viewer.setSorter(tableSorter);
182 182

  
183
		this.setContentDescription(NLS.bind(Messages.ColsRowsInfosEditor_2, titles[0]));
183
		this.setContentDescription(NLS.bind(RCPMessages.ColsRowsInfosEditor_2, titles[0]));
184 184
		createContextMenu(viewer);
185 185
		viewer.refresh();
186 186
		for (TableColumn col : viewer.getTable().getColumns())
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java (revision 513)
51 51
import org.txm.rcp.editors.TXMResultEditorInput;
52 52
import org.txm.rcp.handlers.BaseAbstractHandler;
53 53
import org.txm.rcp.JobsTimer;
54
import org.txm.rcp.Messages;
54
import org.txm.rcp.RCPMessages;
55 55
import org.txm.rcp.StatusLine;
56 56
import org.txm.rcp.TXMWindows;
57 57
import org.txm.rcp.utils.JobHandler;
......
111 111
					return null;
112 112
				}
113 113
				//ask property and Fmins and Vmax
114
				String title = Messages.bind(CAUIMessages.ComputeCorrespondanceAnalysisDialog_0, partition.getName());
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff