Revision 524

tmp/org.txm.textsbalance.rcp/src/org/txm/textsbalance/rcp/editors/BalanceEditor.java (revision 524)
69 69

  
70 70
		
71 71
		// for group tests
72
		Composite p = this.commandParametersGroup;
72
		Composite p = this.getCommandParametersGroup();
73 73
		// for tab folder tests
74 74
		//Composite p = this.getCommandParametersComposite();
75 75

  
76 76
		
77 77
		
78
		Group group = new Group(this.commandParametersGroup, SWT.NONE);
78
		Group group = new Group(p, SWT.NONE);
79 79
		
80 80
		group.setText("Group by:");
81 81
		//group.setLayout(new RowLayout(SWT.VERTICAL));
......
97 97
		groupByWords.setSelection(!groupByTexts.getSelection());
98 98

  
99 99
		
100
		suCombo = new Combo(this.getCommandParametersGroup(), SWT.READ_ONLY);
101
		supCombo = new Combo(this.getCommandParametersGroup(), SWT.READ_ONLY);
100
		suCombo = new Combo(p, SWT.READ_ONLY);
101
		supCombo = new Combo(p, SWT.READ_ONLY);
102 102

  
103 103
		try {
104 104
			loadSU();
......
118 118
				
119 119
				try {
120 120
					loadSUP(((TextsBalance)getResultData()).getCorpus().getStructuralUnit(suCombo.getText()));
121
					compute(true);
121
					compute();
122 122
				}
123 123
				catch(Exception e1) {
124 124
					// TODO Auto-generated catch block
......
144 144
				// persistence
145 145
				TXMPreferences.putLocalInt(getResultData(), TextsBalancePreferences.STRUCTURAL_UNIT_PROPERTY_INDEX, supCombo.getSelectionIndex());
146 146
				TXMPreferences.putLocalBoolean(getResultData(), TextsBalancePreferences.GROUP_BY_WORDS, !groupByTexts.getSelection());
147
				compute(true);
147
				compute();
148 148
			}
149 149

  
150 150
			@Override
......
158 158
		groupByWords.addSelectionListener(listener);
159 159
		
160 160
		
161
		this.compute(false);
162
		this.commandParametersGroup.pack();
163

  
161
		this.compute();
164 162
	}
165 163

  
166 164
	
167 165
	/**
168 166
	 * Computes the balance using local or default parameters.
169 167
	 */
170
	public void compute(boolean update)	{
168
	public void compute()	{
171 169
		try {
172 170
			
173 171
			String suName = this.getStringParameterValue(TextsBalancePreferences.STRUCTURAL_UNIT);
......
190 188
					this.getIntParameterValue(TextsBalancePreferences.METHOD),
191 189
					((TextsBalance) this.getResultData()).getCorpus().getStructuralUnit(suName),
192 190
					supName,
193
					!this.getBooleanParameterValue(TextsBalancePreferences.GROUP_BY_WORDS),
194
					update
191
					!this.getBooleanParameterValue(TextsBalancePreferences.GROUP_BY_WORDS)
195 192
					);
196 193
			
197 194
			
......
208 205
	 * @param method 1: use CQL to solve matches, 2 uses corpus struct indexes, 2 is faster !
209 206
	 * @throws CqiClientException
210 207
	 */
211
	public void compute(final int method, final StructuralUnit su, final String propertyName, final boolean groupByTexts, final boolean update) {
208
	public void compute(final int method, final StructuralUnit su, final String propertyName, final boolean groupByTexts) {
212 209

  
213 210
		Job job = new Job("Compute Texts Balance") {
214 211
		    @Override
......
227 224
					Log.printStackTrace(e);
228 225
				}
229 226
		
230
				computeChart(update);
227
				computeChart(true);
231 228
				
232 229
				// done
233 230
				monitor.done(); 
tmp/org.txm.textsbalance.rcp/META-INF/MANIFEST.MF (revision 524)
14 14
 org.txm.core;bundle-version="0.7.0",
15 15
 org.txm.chartsengine.r.core,
16 16
 org.eclipse.core.expressions;bundle-version="3.4.600",
17
 org.txm.textsbalance.core;bundle-version="1.0.0",
17
 org.txm.textsbalance.core;bundle-version="1.0.0";visibility:=reexport,
18 18
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
19 19
 org.txm.chartsengine.rcp;bundle-version="1.0.0"
20 20
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesResultEditorInput.java (revision 524)
41 41
import org.eclipse.ui.IPersistableElement;
42 42
import org.eclipse.ui.part.EditorPart;
43 43
import org.eclipse.ui.plugin.AbstractUIPlugin;
44
import org.txm.rcp.editors.TXMResultEditorInput;
44
import org.txm.lexicaltable.rcp.editors.TableEditor;
45 45
import org.txm.rcp.Application;
46 46
import org.txm.rcp.IImageKeys;
47
import org.txm.rcp.Messages;
47
import org.txm.rcp.RCPMessages;
48
import org.txm.rcp.editors.TXMResultEditorInput;
48 49
import org.txm.rcp.editors.Tablable;
49
import org.txm.rcp.editors.TableEditor;
50 50
import org.txm.rcp.editors.input.AbstractTablable;
51 51
import org.txm.rcp.editors.input.IProvidingMultiPageEditorInput;
52 52
import org.txm.searchengine.cqp.corpus.Corpus;
......
132 132
			@Override
133 133
			public String[] getColumnTitles() {
134 134
				return new String[] {
135
						Messages.FrequencyListEditorInput_3,
135
						RCPMessages.FrequencyListEditorInput_3,
136 136
						SpecificitiesUIMessages.SpecificitiesResultEditorInput_5,
137 137
						SpecificitiesUIMessages.SpecificitiesResultEditorInput_6,
138 138
						SpecificitiesUIMessages.SpecificitiesResultEditorInput_7 };
......
141 141
			@Override
142 142
			public String[] getColumnTypes() {
143 143
				return new String[] {
144
						Messages.FrequencyListEditorInput_5,
145
						Messages.FrequencyListEditorInput_6,
146
						Messages.FrequencyListEditorInput_6,
144
						RCPMessages.FrequencyListEditorInput_5,
145
						RCPMessages.FrequencyListEditorInput_6,
146
						RCPMessages.FrequencyListEditorInput_6,
147 147
						SpecificitiesUIMessages.SpecificitiesResultEditorInput_11 };
148 148
			}
149 149

  
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecifForm.java (revision 524)
9 9
import org.eclipse.swt.widgets.Composite;
10 10
import org.eclipse.swt.widgets.Label;
11 11
import org.eclipse.swt.widgets.Table;
12
import org.txm.rcp.Messages;
12
import org.txm.rcp.RCPMessages;
13 13

  
14 14

  
15 15
public class SpecifForm extends Composite {
......
38 38
		composite.setLayout(new GridLayout(3, false));
39 39
		
40 40
		Label lblProprit = new Label(composite, SWT.NONE);
41
		lblProprit.setText(Messages.ProgressionForm_7);
41
		lblProprit.setText(RCPMessages.ProgressionForm_7);
42 42
		
43 43
		propCombo = new Combo(composite, SWT.NONE);
44 44
		
45 45
		okButton = new Button(composite, SWT.NONE);
46
		okButton.setText(Messages.InternalViewEditor_11);
46
		okButton.setText("OK");
47 47
		scrolledComposite_1.setContent(composite);
48 48
		scrolledComposite_1.setMinSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
49 49
		
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesTableEditor.java (revision 524)
44 44
import org.eclipse.swt.SWT;
45 45
import org.eclipse.swt.events.SelectionEvent;
46 46
import org.eclipse.swt.events.SelectionListener;
47
import org.eclipse.swt.graphics.Image;
48 47
import org.eclipse.swt.layout.GridData;
49 48
import org.eclipse.swt.layout.GridLayout;
50 49
import org.eclipse.swt.widgets.Composite;
......
59 58
import org.eclipse.ui.PlatformUI;
60 59
import org.txm.core.results.TXMResult;
61 60
import org.txm.objects.TxmObject;
62
import org.txm.rcp.editors.TXMEditorPart;
63
import org.txm.rcp.Messages;
61
import org.txm.rcp.RCPMessages;
64 62
import org.txm.rcp.StatusLine;
63
import org.txm.rcp.editors.TXMEditorPart;
65 64
import org.txm.rcp.editors.TableKeyListener;
66
import org.txm.searchengine.cqp.corpus.Corpus;
67 65
import org.txm.specificities.core.functions.SpecificitesResult;
68 66
import org.txm.specificities.rcp.messages.SpecificitiesUIMessages;
69 67
import org.txm.statsengine.core.StatException;
70 68
/**
71 69
 * Display a table editor with specificites index.
72 70
 * 
73
 * @author sloiseau
71
 * @author sloiseau, mdecorde, sjaquot
74 72
 * 
75 73
 */
76 74
public class SpecificitiesTableEditor extends TXMEditorPart {
77 75

  
78
	public static String ID = "SpecificitiesTableEditor";
76
	public static String ID = SpecificitiesTableEditor.class.getName();
79 77
	
80 78
	/** The specificities table. */
81 79
	private Table specificitesTable;
......
147 145
								tableLines.sort(currentComparator);
148 146
							}
149 147
						});
150
				StatusLine.setMessage(Messages.SORT_DONE);
148
				StatusLine.setMessage(RCPMessages.SORT_DONE);
151 149
				fillDisplay();
152 150
			} catch (Exception e) {
153 151
				System.err.println(NLS.bind(SpecificitiesUIMessages.SpecificitiesTableEditor_1, e)); 
......
217 215
		// create 1st column
218 216
		typeNameColumn = new TableColumn(specificitesTable,
219 217
				SWT.NONE);
220
		typeNameColumn.setText(Messages.ReferencerEditor_9);
221
		typeNameColumn.setToolTipText(Messages.ReferencerEditor_9);
218
		typeNameColumn.setText(RCPMessages.ReferencerEditor_9);
219
		typeNameColumn.setToolTipText(RCPMessages.ReferencerEditor_9);
222 220
		typeNameColumn.setAlignment(SWT.RIGHT);
223 221
		typeNameColumn.pack();
224 222
		typeNameColumn.setWidth((int) (typeNameColumn.getWidth()*1.5));
......
235 233
		typeNameColumn.addSelectionListener(new SelectionListener() {
236 234
			@Override
237 235
			public void widgetSelected(SelectionEvent e) {
238
				StatusLine.setMessage(Messages.SORT_COLUMN);
236
				StatusLine.setMessage(RCPMessages.SORT_COLUMN);
239 237
				Comparator column_comparator = new Comparator() {
240 238
					@Override
241 239
					public int compare(Object o1, Object o2) {
......
269 267
		// create 2nd column
270 268
		typeFrequencyColumn = new TableColumn(viewer
271 269
				.getTable(), SWT.NONE);
272
		typeFrequencyColumn.setText(Messages.FrequencyListEditorInput_4
270
		typeFrequencyColumn.setText(RCPMessages.FrequencyListEditorInput_4
273 271
				+ " "+SpecificitiesUIMessages.SpecificitiesTableEditor_11+" "
274 272
				+ specificitiesResult.getCorpusSize()); 
275
		typeFrequencyColumn.setToolTipText(Messages.FrequencyListEditorInput_4
273
		typeFrequencyColumn.setToolTipText(RCPMessages.FrequencyListEditorInput_4
276 274
				+ SpecificitiesUIMessages.SpecificitiesTableEditor_11
277 275
				+ specificitiesResult.getCorpusSize()); 
278 276
		typeFrequencyColumn.setAlignment(SWT.RIGHT);
......
280 278
		typeFrequencyColumn.addSelectionListener(new SelectionListener() {
281 279
			@Override
282 280
			public void widgetSelected(SelectionEvent e) {
283
				StatusLine.setMessage(Messages.SORT_COLUMN);
281
				StatusLine.setMessage(RCPMessages.SORT_COLUMN);
284 282
				Comparator<Object[]> column_comparator = new Comparator<Object[]>() {
285 283
					@Override
286 284
					public int compare(Object[] line1, Object[] line2) { // Compare two
......
340 338
			freqpartTableColumn.addSelectionListener(new SelectionListener() {
341 339
				@Override
342 340
				public void widgetSelected(SelectionEvent e) {
343
					StatusLine.setMessage(Messages.SORT_COLUMN);
341
					StatusLine.setMessage(RCPMessages.SORT_COLUMN);
344 342
					Comparator<Object> column_comparator = new Comparator<Object>() {
345 343
						@Override
346 344
						public int compare(Object o1, Object o2) { // Compare
......
386 384
			partTableColumn.addSelectionListener(new SelectionListener() {
387 385
				@Override
388 386
				public void widgetSelected(SelectionEvent e) {
389
					StatusLine.setMessage(Messages.SORT_COLUMN);
387
					StatusLine.setMessage(RCPMessages.SORT_COLUMN);
390 388
					Comparator<Object> column_comparator = new Comparator<Object>() {
391 389
						@Override
392 390
						public int compare(Object o1, Object o2) { // Compare
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/handlers/ComputeSpecifities.java (revision 524)
47 47
import org.txm.rcp.editors.TXMResultEditorInput;
48 48
import org.txm.rcp.handlers.BaseAbstractHandler;
49 49
import org.txm.rcp.JobsTimer;
50
import org.txm.rcp.Messages;
50
import org.txm.rcp.RCPMessages;
51 51
import org.txm.rcp.StatusLine;
52 52
import org.txm.rcp.utils.JobHandler;
53 53
import org.txm.rcp.views.QueriesView;
......
110 110
		window = HandlerUtil.getActiveWorkbenchWindow(event);
111 111
		selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
112 112
		if(selection == null) {
113
			Log.info(Messages.ComputeSpecifities_1);
113
			Log.info(RCPMessages.ComputeSpecifities_1);
114 114
			return null;
115 115
		}
116 116
		Object s = selection.getFirstElement();
......
126 126

  
127 127
				// final CorporaView corporaView = (CorporaView)
128 128
				// PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(CorporaView.ID);
129
				JobHandler jobhandler = new JobHandler(Messages.ComputeSpecificities_0) {
129
				JobHandler jobhandler = new JobHandler(RCPMessages.ComputeSpecificities_0) {
130 130
					@Override
131 131
					protected IStatus run(IProgressMonitor monitor) {
132 132
						this.runInit(monitor);
133 133
						try {
134 134
							JobsTimer.start();
135
							String str = NLS.bind(Messages.ComputeSpecificities_2, new Object[] { partition.getName(), property });
135
							String str = NLS.bind(RCPMessages.ComputeSpecificities_2, new Object[] { partition.getName(), property });
136 136
							monitor.beginTask(str, 100);
137 137
							try {
138 138
								System.out.println(str);
......
140 140
								specificitiesResult = new SpecificitesResult(partition, property, Fmin, maxScore);
141 141
								this.releaseSemaphore();
142 142

  
143
								System.out.println(NLS.bind(Messages.DONE, specificitiesResult.getName()));
143
								System.out.println(NLS.bind(RCPMessages.DONE, specificitiesResult.getName()));
144 144
							} catch(Exception e) {
145
								System.out.println(Messages.ComputeSpecifities_4 + e);
145
								System.out.println(RCPMessages.ComputeSpecifities_4 + e);
146 146
								org.txm.rcp.utils.Logger.printStackTrace(e);
147 147
								return Status.CANCEL_STATUS;
148 148
							}
......
152 152
							// partition.storeResult(specificitiesResult);
153 153
							monitor.worked(5);
154 154

  
155
							monitor.subTask(Messages.ComputeSpecifities_10);
155
							monitor.subTask(RCPMessages.ComputeSpecifities_10);
156 156
							syncExec(new Runnable() {
157 157
								@Override
158 158
								public void run() {
159 159
									IWorkbenchPage page = window.getActivePage();
160 160
									SpecificitiesResultEditorInput editorInput = new SpecificitiesResultEditorInput(specificitiesResult, partition);
161 161
									try {
162
										StatusLine.setMessage(Messages.ComputeSpecifities_10);
162
										StatusLine.setMessage(RCPMessages.ComputeSpecifities_10);
163 163
										page.openEditor(editorInput, SpecificitiesTableEditor.ID); //$NON-NLS-1$
164 164
									}
165 165
									catch(PartInitException e) {
166
										System.err.println(NLS.bind(Messages.Error_computing_specificities, e));
166
										System.err.println(NLS.bind(RCPMessages.Error_computing_specificities, e));
167 167
										org.txm.rcp.utils.Logger.printStackTrace(e);
168 168
									}
169 169
								}
......
173 173
							if(monitor.isCanceled())
174 174
								return Status.CANCEL_STATUS;
175 175

  
176
							monitor.subTask(Messages.ComputeSpecifities_2);
176
							monitor.subTask(RCPMessages.ComputeSpecifities_2);
177 177
							syncExec(new Runnable() {
178 178
								@Override
179 179
								public void run() {
......
206 206
			if(code == Window.OK) {
207 207
				final Property property = d.getProperty();
208 208
				try {
209
					JobHandler jobhandler = new JobHandler(Messages.ComputeSpecificities_0) {
209
					JobHandler jobhandler = new JobHandler(RCPMessages.ComputeSpecificities_0) {
210 210
						@Override
211 211
						protected IStatus run(IProgressMonitor monitor) {
212 212
							this.runInit(monitor);
......
216 216
								if(parentCorpus == null)
217 217
									parentCorpus = subcorpus.getMainCorpus();
218 218

  
219
								System.out.println(NLS.bind(Messages.ComputeSpecifities_3, new Object[] { subcorpus.getName(), parentCorpus.getName(), property }));
219
								System.out.println(NLS.bind(RCPMessages.ComputeSpecifities_3, new Object[] { subcorpus.getName(), parentCorpus.getName(), property }));
220 220
								specificitiesResult = new SpecificitesResult(parentCorpus, subcorpus, property, maxScore);
221
								System.out.println(NLS.bind(Messages.DONE, specificitiesResult.getName()));
221
								System.out.println(NLS.bind(RCPMessages.DONE, specificitiesResult.getName()));
222 222
								subcorpus.addResult(specificitiesResult);
223 223
							}
224 224
							catch(Exception e) {
225
								System.err.println(NLS.bind(Messages.Error_computing_specificities, e));
225
								System.err.println(NLS.bind(RCPMessages.Error_computing_specificities, e));
226 226
								System.err.println(e);
227 227
								org.txm.rcp.utils.Logger.printStackTrace(e);
228 228
							}
229 229

  
230
							monitor.subTask(Messages.ComputeSpecifities_2);
230
							monitor.subTask(RCPMessages.ComputeSpecifities_2);
231 231
							syncExec(new Runnable() {
232 232
								@Override
233 233
								public void run() {
......
254 254
					jobhandler.startJob();
255 255
				}
256 256
				catch(Exception e) {
257
					System.err.println(NLS.bind(Messages.Error_computing_specificities, e));
257
					System.err.println(NLS.bind(RCPMessages.Error_computing_specificities, e));
258 258
				}
259 259
			}
260 260
		}
261 261
		else if(s instanceof LexicalTable) {
262 262
			final LexicalTable table = (LexicalTable) s;
263
			JobHandler jobhandler = new JobHandler(Messages.ComputeSpecificities_0) {
263
			JobHandler jobhandler = new JobHandler(RCPMessages.ComputeSpecificities_0) {
264 264
				@Override
265 265
				protected IStatus run(IProgressMonitor monitor) {
266 266
					this.runInit(monitor);
267 267
					try {
268 268
						JobsTimer.start();
269
						monitor.beginTask(NLS.bind(Messages.ComputeSpecifities_11, table.getPartition().getName()), 100);
269
						monitor.beginTask(NLS.bind(RCPMessages.ComputeSpecifities_11, table.getPartition().getName()), 100);
270 270
						try {
271
							System.out.println(Messages.ComputeSpecificities_0 + ": " + table.getPartition().getName()); //$NON-NLS-1$
271
							System.out.println(RCPMessages.ComputeSpecificities_0 + ": " + table.getPartition().getName()); //$NON-NLS-1$
272 272
							this.acquireSemaphore();
273 273
							specificitiesResult = new SpecificitesResult(table, maxScore);
274 274
							this.releaseSemaphore();
275
							System.out.println(NLS.bind(Messages.DONE, specificitiesResult.getName()));
275
							System.out.println(NLS.bind(RCPMessages.DONE, specificitiesResult.getName()));
276 276
						}
277 277
						catch(StatException e) {
278
							System.err.println(NLS.bind(Messages.Error_computing_specificities, e));
278
							System.err.println(NLS.bind(RCPMessages.Error_computing_specificities, e));
279 279
							org.txm.rcp.utils.Logger.printStackTrace(e);
280 280
							return Status.CANCEL_STATUS;
281 281
						}
......
288 288
						this.releaseSemaphore();
289 289
						monitor.worked(5);
290 290

  
291
						monitor.subTask(Messages.ComputeSpecifities_10);
291
						monitor.subTask(RCPMessages.ComputeSpecifities_10);
292 292
						syncExec(new Runnable() {
293 293
							@Override
294 294
							public void run() {
......
301 301
									editorInput = new SpecificitiesResultEditorInput(specificitiesResult, table.getPartition());
302 302
								}
303 303
								try {
304
									StatusLine.setMessage(Messages.ComputeSpecifities_10);
304
									StatusLine.setMessage(RCPMessages.ComputeSpecifities_10);
305 305
									page.openEditor(editorInput, SpecificitiesTableEditor.ID); //$NON-NLS-1$
306 306

  
307 307
								}
......
316 316
							return Status.CANCEL_STATUS;
317 317
						}
318 318

  
319
						monitor.subTask(Messages.ComputeSpecifities_2);
319
						monitor.subTask(RCPMessages.ComputeSpecifities_2);
320 320
						syncExec(new Runnable() {
321 321
							@Override
322 322
							public void run() {
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/dialogs/ComputeSpecificitiesForSubcorpusDialog.java (revision 524)
40 40
import org.eclipse.swt.widgets.Control;
41 41
import org.eclipse.swt.widgets.Label;
42 42
import org.eclipse.swt.widgets.Shell;
43
import org.txm.rcp.Messages;
43
import org.txm.rcp.RCPMessages;
44 44
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
45 45
import org.txm.searchengine.cqp.corpus.Property;
46 46
import org.txm.searchengine.cqp.corpus.Subcorpus;
......
87 87
	@Override
88 88
	protected void configureShell(Shell newShell) {
89 89
		super.configureShell(newShell);
90
		newShell.setText(Messages.Compute_Specificities);
90
		newShell.setText(RCPMessages.Compute_Specificities);
91 91
	}
92 92

  
93 93
	/**
......
109 109
		composite.setLayout(layout);
110 110

  
111 111
		Label anaPropLabel = new Label(composite, SWT.NONE);
112
		anaPropLabel.setText(Messages.CreatePartitionDialog_4);
112
		anaPropLabel.setText(RCPMessages.CreatePartitionDialog_4);
113 113
		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
114 114
				false, false));
115 115

  
......
136 136
		int propIndex = anaPropCombo.getSelectionIndex();
137 137
		if (propIndex == -1) {
138 138
			MessageDialog.openError(getShell(),
139
					Messages.Invalid_analysis_property,
140
					Messages.Structure_field_not_empty);
139
					RCPMessages.Invalid_analysis_property,
140
					RCPMessages.Structure_field_not_empty);
141 141
			return;
142 142
		}
143 143

  
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/dialogs/ComputeSpecificitiesDialog.java (revision 524)
47 47
import org.eclipse.swt.widgets.Listener;
48 48
import org.eclipse.swt.widgets.Shell;
49 49
import org.eclipse.swt.widgets.Text;
50
import org.txm.rcp.Messages;
50
import org.txm.rcp.RCPMessages;
51 51
import org.txm.rcp.StatusLine;
52 52
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
53 53
import org.txm.searchengine.cqp.corpus.Part;
......
105 105
					.getCorpus().getOrderedProperties());
106 106
		} catch (CqiClientException e) {
107 107
			System.err.println(NLS.bind(
108
					Messages.ComputeSpecificitiesDialog_0, e));
108
					RCPMessages.ComputeSpecificitiesDialog_0, e));
109 109
		}
110 110
		this.setShellStyle(this.getShellStyle() | SWT.RESIZE);
111 111
	}
......
116 116
	@Override
117 117
	protected void configureShell(Shell newShell) {
118 118
		super.configureShell(newShell);
119
		newShell.setText(Messages.Compute_Specificities);
119
		newShell.setText(RCPMessages.Compute_Specificities);
120 120
	}
121 121

  
122 122
	/* (non-Javadoc)
......
131 131
		composite.setLayout(layout);
132 132

  
133 133
		Label anaPropLabel = new Label(composite, SWT.NONE);
134
		anaPropLabel.setText(Messages.CreatePartitionDialog_4);
134
		anaPropLabel.setText(RCPMessages.CreatePartitionDialog_4);
135 135
		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
136 136
				false, false));
137 137

  
......
150 150

  
151 151
		// set the focus
152 152
//		Label advancedFocusLabel = new Label(composite, SWT.NONE);
153
//		advancedFocusLabel.setText(Messages.ComputeSpecificitiesDialog_3);
153
//		advancedFocusLabel.setText(RCPMessages.ComputeSpecificitiesDialog_3);
154 154
//		advancedFocusLabel.setLayoutData(new GridData(GridData.END,
155 155
//				GridData.CENTER, false, false));
156 156
//
......
165 165
		if (showPartFocusSelection) {
166 166

  
167 167
			Label advancedPartLabel = new Label(composite, SWT.NONE);
168
			advancedPartLabel.setText(Messages.ComputeSpecificitiesDialog_4);
168
			advancedPartLabel.setText(RCPMessages.ComputeSpecificitiesDialog_4);
169 169
			advancedPartLabel.setLayoutData(new GridData(GridData.END,
170 170
					GridData.CENTER, false, false));
171 171

  
......
307 307
		int propIndex = anaPropCombo.getSelectionIndex();
308 308
		if (propIndex == -1) {
309 309
			MessageDialog.openError(getShell(),
310
					Messages.Invalid_analysis_property,
311
					Messages.Structure_field_not_empty);
310
					RCPMessages.Invalid_analysis_property,
311
					RCPMessages.Structure_field_not_empty);
312 312
			return;
313 313
		}
314 314
		property = properties.get(propIndex);
......
326 326
				}
327 327
				catch(PatternSyntaxException e)
328 328
				{
329
					String str = NLS.bind(Messages.ComputeSpecificitiesDialog_1, e.getMessage());
329
					String str = NLS.bind(RCPMessages.ComputeSpecificitiesDialog_1, e.getMessage());
330 330
					System.out.println(str);
331 331
					StatusLine.error(str);
332 332
					return;
......
371 371
	 */
372 372
	public List<Part> getPartFocus() {
373 373
		if (!showPartFocusSelection) {
374
			//throw new IllegalStateException(Messages.ComputeSpecificitiesDialog_9);
374
			//throw new IllegalStateException(RCPMessages.ComputeSpecificitiesDialog_9);
375 375
		}
376 376
		// System.out.println("get partfocus (string ,normalement) "+partFocusString);
377 377
		return partFocusString;
tmp/org.txm.specificities.rcp/build.properties (revision 524)
2 2
output.. = bin/
3 3
bin.includes = META-INF/,\
4 4
               .,\
5
               plugin.xml
5
               plugin.xml,\
6
               icons/,\
7
               OSGI-INF/
tmp/org.txm.specificities.rcp/.settings/org.eclipse.core.resources.prefs (revision 524)
1 1
eclipse.preferences.version=1
2 2
encoding//OSGI-INF/l10n/bundle_ru_utf-8.properties=UTF-8
3
encoding//src/org/txm/specificities/rcp/messages/messages.properties=UTF-8
4
encoding//src/org/txm/specificities/rcp/messages/messages_fr.properties=UTF-8
5
encoding//src/org/txm/specificities/rcp/messages/messages_ru.properties=UTF-8
tmp/org.txm.specificities.rcp/META-INF/MANIFEST.MF (revision 524)
18 18
 org.txm.specificities.core,
19 19
 org.txm.chartsengine.rcp,
20 20
 org.txm.rcp;bundle-version="0.7.8",
21
 org.eclipse.core.expressions;bundle-version="3.4.600"
21
 org.eclipse.core.expressions;bundle-version="3.4.600",
22
 org.txm.lexicaltable.rcp
22 23
Export-Package: org.txm.specificities.rcp.adapters,
23 24
 org.txm.specificities.rcp.editors,
24 25
 org.txm.specificities.rcp.handlers,
tmp/org.txm.textsbalance.core/META-INF/MANIFEST.MF (revision 524)
8 8
 org.txm.textsbalance.core.chartsengine.r,
9 9
 org.txm.textsbalance.core.functions,
10 10
 org.txm.textsbalance.core.preferences
11
Require-Bundle: org.txm.utils;bundle-version="1.0.0",
12
 org.txm.searchengine.cqp.core;bundle-version="1.1.0",
11
Require-Bundle: org.txm.utils;bundle-version="1.0.0";visibility:=reexport,
12
 org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport,
13 13
 org.eclipse.core.runtime;bundle-version="3.10.0",
14
 org.txm.core;bundle-version="0.7.0",
15
 org.txm.chartsengine.core;bundle-version="1.0.0",
16
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
17
 org.txm.chartsengine.r.core;bundle-version="1.0.0",
18
 org.txm.searchengine.core;bundle-version="1.0.0"
14
 org.txm.core;bundle-version="0.7.0";visibility:=reexport,
15
 org.txm.chartsengine.core;bundle-version="1.0.0";visibility:=reexport,
16
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0";visibility:=reexport,
17
 org.txm.chartsengine.r.core;bundle-version="1.0.0";visibility:=reexport,
18
 org.txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport
19 19
Bundle-Vendor: Textometrie.org
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/views/knowledgerepositories/KRView.java (revision 524)
101 101
	TreeViewer tv;
102 102

  
103 103
	/** The ID. */
104
	public static String ID = "org.txm.rcp.views.knowledgerepositories.KRView"; //$NON-NLS-1$
104
	public static String ID = KRView.class.getName();
105 105

  
106 106
	/**
107 107
	 * Instantiates a new queries view.
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java (revision 524)
55 55
public class RConsole extends ViewPart implements MessagePrinter {
56 56

  
57 57
	/** The ID. */
58
	public static String ID = "org.txm.rcp.views.RConsole"; //$NON-NLS-1$
58
	public static String ID = RConsole.class.getName();
59 59

  
60 60
	/** The text area. */
61 61
	private StyledText textArea;
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java (revision 524)
63 63
import org.txm.cah.core.functions.CAH;
64 64
import org.txm.concordance.core.functions.Concordance;
65 65
import org.txm.cooccurrence.core.functions.Cooccurrence;
66
import org.txm.core.preferences.TBXPreferences;
67 66
import org.txm.core.results.TXMResult;
68 67
import org.txm.functions.referencer.Referencer;
69 68
import org.txm.index.core.functions.Index;
......
82 81
import org.txm.searchengine.cqp.corpus.Partition;
83 82
import org.txm.specificities.core.functions.SpecificitesResult;
84 83
import org.txm.statsengine.r.core.RWorkspace;
85
// TODO: Auto-generated Javadoc
86 84
/**
87
 * The Class RVariablesView.
85
 * The Class RVariablesView: list the R variables linked to TXMResult that have a representation in the R workspace
88 86
 */
89 87
public class RVariablesView extends ViewPart {
90 88

  
......
92 90
	TreeViewer tv;
93 91

  
94 92
	/** The ID. */
95
	public static String ID = "RVariablesView"; //$NON-NLS-1$
93
	public static String ID = RVariablesView.class.getName();
96 94

  
97 95
	/**
98 96
	 * Refresh.
tmp/org.txm.rcp.feature/feature.xml (revision 524)
533 533
         version="0.0.0"
534 534
         unpack="false"/>
535 535

  
536
   <plugin
537
         id="org.txm.specificities.rcp"
538
         download-size="0"
539
         install-size="0"
540
         version="0.0.0"
541
         unpack="false"/>
542

  
543
   <plugin
544
         id="org.txm.textsbalance.core"
545
         download-size="0"
546
         install-size="0"
547
         version="0.0.0"
548
         unpack="false"/>
549

  
550
   <plugin
551
         id="org.txm.textsbalance.rcp"
552
         download-size="0"
553
         install-size="0"
554
         version="0.0.0"
555
         unpack="false"/>
556

  
557
   <plugin
558
         id="org.txm.wordcloud.core"
559
         download-size="0"
560
         install-size="0"
561
         version="0.0.0"
562
         unpack="false"/>
563

  
564
   <plugin
565
         id="org.txm.wordcloud.rcp"
566
         download-size="0"
567
         install-size="0"
568
         version="0.0.0"
569
         unpack="false"/>
570

  
536 571
</feature>
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/cmdparameters/ParametersView.java (revision 524)
48 48
	Label currentEditorLabel;
49 49

  
50 50
	/** The ID. */
51
	public static String ID = "org.txm.rcp.views.cmdparameters.ParametersView"; //$NON-NLS-1$
51
	public static String ID = ParametersView.class.getName(); //$NON-NLS-1$
52 52

  
53 53
	/**
54 54
	 * Instantiates a new queries view.
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/BasesView.java (revision 524)
81 81
	TreeViewer tv;
82 82

  
83 83
	/** The ID. */
84
	public static String ID = "org.txm.rcp.views.BasesView"; //$NON-NLS-1$
84
	public static String ID = BasesView.class.getName();
85 85

  
86 86
	/**
87 87
	 * Instantiates a new bases view.
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java (revision 524)
45 45
public class GroovyConsole extends ViewPart implements Runnable {
46 46

  
47 47
	/** The ID. */
48
	public static String ID = "org.txm.rcp.views.GroovyConsole"; //$NON-NLS-1$
48
	public static String ID = GroovyConsole.class.getName();
49 49
	
50 50
	/** The text area. */
51 51
	private static StyledText textArea;
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java (revision 524)
99 99
	TreeViewer tv;
100 100

  
101 101
	/** The ID. */
102
	public static String ID = "org.txm.rcp.views.QueriesView"; //$NON-NLS-1$
102
	public static String ID = QueriesView.class.getName();
103 103

  
104 104
	/**
105 105
	 * Instantiates a new queries view.
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java (revision 524)
89 89
	protected TXMBrowser attachedBrowserEditor;
90 90

  
91 91
	/** The ID. */
92
	public static String ID = "org.txm.rcp.views.InternalCorpusView"; //$NON-NLS-1$
92
	public static String ID = SummaryView.class.getName();
93 93

  
94 94
	/**
95
	 * Instantiates a new queries view.
95
	 * Instantiates a new summary view.
96 96
	 */
97 97
	public SummaryView() {
98 98
		// System.out.println(Messages.ObjectExplorer_9);
......
151 151

  
152 152
				tv.setInput(summary);
153 153
				refresh();
154
				tv.expandToLevel(selectedProps.size()+1);
154 155
			}
155 156
		} catch (Exception e) {
156 157
			System.out.println(RCPMessages.InternalCorpusView_0);
......
285 286
				try {
286 287
					selectedCorpus = CorpusManager.getCorpusManager().getCorpus(corpusName);
287 288
					reloadProperties();
289
					compute();
288 290
				} catch (CqiClientException e1) {
289 291
					// TODO Auto-generated catch block
290 292
					org.txm.rcp.utils.Logger.printStackTrace(e1);
......
440 442
		 */
441 443
		@Override
442 444
		public String getText(Object element) {
443
			if (element instanceof Summary.TreeNode)
444
				return ((Summary.TreeNode) element).getInfo();
445
			if (element instanceof Summary.TreeNode) {
446
				String s = ((Summary.TreeNode) element).getInfo();
447
				if (s == null || s.length() == 0) return ((Summary.TreeNode) element).toString();
448
				return s;
449
			}
445 450
			return NLS.bind(RCPMessages.InternalCorpusView_2, element);
446 451
		}
447 452

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorPart.java (revision 524)
3 3
 */
4 4
package org.txm.rcp.editors;
5 5

  
6
import java.util.HashMap;
7

  
8 6
import org.eclipse.core.runtime.IProgressMonitor;
9 7
import org.eclipse.core.runtime.IStatus;
10 8
import org.eclipse.core.runtime.Status;
11 9
import org.eclipse.swt.SWT;
12
import org.eclipse.swt.events.SelectionEvent;
13
import org.eclipse.swt.events.SelectionListener;
14 10
import org.eclipse.swt.layout.GridData;
15 11
import org.eclipse.swt.layout.GridLayout;
16 12
import org.eclipse.swt.layout.RowLayout;
17 13
import org.eclipse.swt.widgets.Composite;
18
import org.eclipse.swt.widgets.Group;
19
import org.eclipse.swt.widgets.ToolItem;
20 14
import org.eclipse.ui.IEditorInput;
21 15
import org.eclipse.ui.IEditorSite;
22 16
import org.eclipse.ui.IWorkbenchPage;
......
25 19
import org.eclipse.ui.part.EditorPart;
26 20
import org.txm.core.results.TXMParameters;
27 21
import org.txm.core.results.TXMResult;
28
import org.txm.rcp.IImageKeys;
29 22
import org.txm.rcp.JobsTimer;
30 23
import org.txm.rcp.StatusLine;
31 24
import org.txm.rcp.TXMWindows;
......
124 117
		return topToolBarContainer;
125 118
	}
126 119
	
127
	public void getComputingParametersGroup() {
128
		
129
	}
130
	
131 120
	public TXMEditorToolBar getTopToolbar() {
132 121
		return topToolBar;
133 122
	}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/function/OpenParaBrowser.java (revision 524)
51 51
public class OpenParaBrowser extends AbstractHandler {
52 52

  
53 53
	/** The ID. */
54
	public static String ID = "org.txm.rcp.commands.function.OpenParaBrowser"; //$NON-NLS-1$
54
	public static String ID = OpenParaBrowser.class.getName();
55 55

  
56 56
	/** The window. */
57 57
	private IWorkbenchWindow window;

Also available in: Unified diff