Revision 507

tmp/org.txm.utils/src/org/txm/utils/AsciiUtils.java (revision 507)
30 30

  
31 31
/**
32 32
 * The Class AsciiUtils.
33
 * 
34
 * FR:
35
 * 
36
 * AsciiUtils.convertNonAscii(str) supprime les accents (note : cette méthode fonctionne avec une liste fermée de caractères accentués)
37

  
38
AsciiUtils.removePunct(str) supprime les ponctuations
39

  
40
AsciiUtils.buildAttributeId(str) créé un identifiant CQP compatible
41

  
42
AsciiUtils.buildId(str) créé un identifiant compatible corpus CQP
33 43
 *
34 44
 * @see : http://www.rgagnon.com/javadetails/java-0456.html
35 45
 */
......
112 122
		if (s.length() == 0) return s;
113 123

  
114 124
		String rez = convertNonAscii(s).toLowerCase();
115
		rez = s.replaceAll("\\p{Space}","");
125
		rez = rez.replaceAll("\\p{Space}","");
116 126
		rez = rez.replaceAll("[¤€§µ£°().,;:/?§%\"'*+\\-}\\]\\[{#~&]",""); //$NON-NLS-1$ //$NON-NLS-2$
117 127
		// remove first chars if number
118 128
		char c = rez.charAt(0);
tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java (revision 507)
37 37
import org.eclipse.jface.viewers.TableViewer;
38 38
import org.eclipse.osgi.util.NLS;
39 39
import org.eclipse.swt.SWT;
40
import org.eclipse.swt.custom.ScrolledComposite;
41
import org.eclipse.swt.events.ControlAdapter;
42
import org.eclipse.swt.events.ControlEvent;
43 40
import org.eclipse.swt.events.KeyEvent;
44 41
import org.eclipse.swt.events.KeyListener;
45 42
import org.eclipse.swt.events.SelectionEvent;
......
47 44
import org.eclipse.swt.graphics.Font;
48 45
import org.eclipse.swt.graphics.FontData;
49 46
import org.eclipse.swt.graphics.Point;
50
import org.eclipse.swt.graphics.Rectangle;
51 47
import org.eclipse.swt.layout.FormAttachment;
52 48
import org.eclipse.swt.layout.FormData;
53 49
import org.eclipse.swt.layout.FormLayout;
......
93 89
import org.txm.searchengine.cqp.corpus.query.Query;
94 90
import org.txm.statsengine.r.rcp.views.RVariablesView;
95 91
import org.txm.utils.logger.Log;
96
// TODO: Auto-generated Javadoc
92

  
97 93
/**
98
 * display the index parameters and result.
94
 * display an index/lexicon parameters and result.
99 95
 *
100 96
 * @author mdecorde
101 97
 */
......
174 170
	/** The prop separator. */
175 171
	protected String propSeparator = "_"; //$NON-NLS-1$
176 172

  
177
	/** The scroll composite. */
178
	private ScrolledComposite scrollComposite;
173
//	/** The scroll composite. */
174
//	private ScrolledComposite scrollComposite;
175
//
176
//	/** The head composite. */
177
//	private Composite headComposite;
179 178

  
180
	/** The head composite. */
181
	private Composite headComposite;
182

  
183 179
	/** The title. */
184 180
	String title;
185 181

  
......
377 373
	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
378 374
	 */
379 375
	@Override
380
	public void createPartControl(final Composite parent) {
376
	public void createPartControl(Composite parent) {
377
		super.createPartControl(parent);
378
		
379
		//TODO: hack until the parameter area is fully designed
380
		parent = new Composite(parent, SWT.NONE);
381 381
		FormLayout parentLayout = new FormLayout();
382 382
		parent.setLayout(parentLayout);
383

  
384
		//create scrollable area
385
		scrollComposite = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.NONE);
386
		FormData headLayoutData = new FormData();
387
		headLayoutData.top = new FormAttachment(0, 0);
388
		headLayoutData.left = new FormAttachment(0);
389
		headLayoutData.right = new FormAttachment(100);
390
		scrollComposite.setLayoutData(headLayoutData);
391
		scrollComposite.setLayout(new FormLayout());
392

  
393
		headComposite = new Composite(scrollComposite, SWT.NONE);
394
		headLayoutData = new FormData();
395
		headLayoutData.top = new FormAttachment(0);
396
		headLayoutData.bottom = new FormAttachment(100);
397
		headLayoutData.left = new FormAttachment(0);
398
		headLayoutData.right = new FormAttachment(100);
399
		headComposite.setLayoutData(headLayoutData);
400
		headComposite.setLayout(new FormLayout());
401

  
402
		scrollComposite.setContent(headComposite);
403
		scrollComposite.setExpandVertical(true);
404
		scrollComposite.setExpandHorizontal(true);
405
		scrollComposite.addControlListener(new ControlAdapter() {
406
			@Override
407
			public void controlResized(ControlEvent e) {
408
				Rectangle r = scrollComposite.getClientArea();
409
				scrollComposite.setMinSize(headComposite.computeSize(
410
						SWT.DEFAULT, SWT.DEFAULT));
411
			}
412
		});
413

  
414
		final Composite paramArea = new Composite(headComposite, SWT.NONE);
415
		FormData paramLayoutData = new FormData();
416
		paramLayoutData.top = new FormAttachment(0);
417
		paramLayoutData.left = new FormAttachment(0);
418
		paramLayoutData.right = new FormAttachment(100);
419
		paramArea.setLayoutData(paramLayoutData);
420

  
383
		parent.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
384
		
385
		Composite paramArea = this.getCommandParametersGroup();
386
		paramArea.setLayout(new FormLayout());
387
		
421 388
		// info&navigation panel
422
		final Composite infosArea = new Composite(headComposite, SWT.NONE);
389
		final Composite infosArea = new Composite(parent, SWT.NONE);
423 390
		FormData infosLayoutData = new FormData();
424 391
		infosLayoutData.top = new FormAttachment(paramArea, 0);
425 392
		infosLayoutData.left = new FormAttachment(0);
......
428 395

  
429 396
		Composite resultArea = new Composite(parent, SWT.NONE);
430 397
		FormData resultLayoutData = new FormData();
431
		resultLayoutData.top = new FormAttachment(scrollComposite, 0);
398
		resultLayoutData.top = new FormAttachment(infosArea, 0);
432 399
		resultLayoutData.left = new FormAttachment(0);
433 400
		resultLayoutData.right = new FormAttachment(100);
434 401
		resultLayoutData.bottom = new FormAttachment(100);
435 402
		resultArea.setLayoutData(resultLayoutData);
436 403

  
437
		// compose paramArea
438
		FormLayout paramLayout = new FormLayout();
439
		paramArea.setLayout(paramLayout);
440

  
441 404
		// on créé une Query, ici le pivot de la concordance est "[]"
442 405
		// Query Area: query itself + view properties
443 406
		Composite queryArea = new Composite(paramArea, SWT.NONE);
......
516 479
		};
517 480
		go.addSelectionListener(listener2);
518 481

  
519
		// | Properties: word_pos [Edit] |
520
		/*
521
		 * propsArea = new PropertiesSelector(paramArea, SWT.NONE);
522
		 * propsArea.setLayout(new GridLayout(3, false));
523
		 * //propsArea.setCorpus(this.corpus);
524
		 * 
525
		 * FormData propsLayoutData = new FormData(); propsLayoutData.top = new
526
		 * FormAttachment (queryArea, 0); propsLayoutData.left = new
527
		 * FormAttachment (0); propsLayoutData.right = new FormAttachment (100);
528
		 * propsArea.setLayoutData(propsLayoutData);
529
		 */
530 482
		// Filters
531 483
		Composite filtercontrols = new Composite(paramArea, SWT.NONE);
532 484
		FormData filtersLayoutData = new FormData();
......
832 784
		separatorColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
833 785
		separatorColumn.setText(""); //$NON-NLS-1$
834 786
		separatorColumn.pack();
835

  
787
		paramArea.pack();
836 788
		initializeFields();
837 789

  
838 790
		createContextMenu(viewer);
tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/ComputeLexicon.java (revision 507)
66 66
		
67 67
		try {
68 68
			IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
69
			DictionnaryEditor editor = (DictionnaryEditor) page.openEditor(editorInput, DictionnaryEditor.class.getName()); //$NON-NLS-1$			
69
			page.openEditor(editorInput, DictionnaryEditor.class.getName()); //$NON-NLS-1$			
70 70
		} catch (Exception e) {
71 71
			org.txm.rcp.utils.Logger.printStackTrace(e);
72 72
		} 
tmp/org.txm.rcp.feature/feature.xml (revision 507)
84 84
         version="0.0.0"/>
85 85

  
86 86
   <requires>
87
      <import plugin="org.eclipse.persistence.jpa" version="2.6.0" match="greaterOrEqual"/>
88
      <import plugin="org.eclipse.persistence.jpa.jpql" version="2.6.0" match="greaterOrEqual"/>
89
      <import plugin="javax.persistence" version="2.1.0" match="greaterOrEqual"/>
87 90
      <import plugin="org.txm.utils" version="1.0.0" match="greaterOrEqual"/>
88
      <import plugin="org.txm.libs.groovy-all" version="1.0.0" match="greaterOrEqual"/>
91
      <import plugin="org.eclipse.osgi" version="3.10.2" match="greaterOrEqual"/>
92
      <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
93
      <import plugin="org.txm.searchengine.core" version="1.0.0" match="greaterOrEqual"/>
94
      <import plugin="org.eclipse.ui.workbench"/>
95
      <import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
96
      <import plugin="org.txm.statsengine.core" version="1.0.0" match="greaterOrEqual"/>
89 97
      <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>
98
      <import plugin="org.txm.chartsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
99
      <import plugin="org.txm.chartsengine.jfreechart.core" version="1.0.0" match="greaterOrEqual"/>
100
      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
101
      <import plugin="org.eclipse.ui" version="3.106.1" match="greaterOrEqual"/>
102
      <import plugin="org.txm.lexicaltable.core" version="1.0.0" match="greaterOrEqual"/>
103
      <import plugin="org.txm.lexicaltable.rcp" version="1.0.0" match="greaterOrEqual"/>
104
      <import plugin="org.txm.ca.core" version="1.0.0" match="greaterOrEqual"/>
105
      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
106
      <import plugin="org.txm.statsengine.r.rcp" version="1.0.0" match="greaterOrEqual"/>
107
      <import plugin="org.txm.cah.core" version="1.0.0" match="greaterOrEqual"/>
108
      <import plugin="org.txm.chartsengine.rcp" version="1.0.0" match="greaterOrEqual"/>
109
      <import plugin="org.txm.rcp" version="0.7.8" match="greaterOrEqual"/>
110
      <import plugin="org.txm.libs.jfreechart" version="1.0.17" match="greaterOrEqual"/>
111
      <import plugin="org.txm.libs.jfreesvg" version="1.7.0" match="greaterOrEqual"/>
112
      <import plugin="org.txm.chartsengine.core" version="1.0.0" match="greaterOrEqual"/>
113
      <import plugin="org.eclipse.core.resources"/>
114
      <import plugin="org.eclipse.swt"/>
115
      <import plugin="org.txm.libs.itext" version="2.1.5" match="greaterOrEqual"/>
116
      <import plugin="org.eclipse.swt" version="3.103.2" match="greaterOrEqual"/>
117
      <import plugin="org.txm.annotation.core" version="1.0.0" match="greaterOrEqual"/>
118
      <import plugin="org.txm.cooccurrence.core" version="1.0.0" match="greaterOrEqual"/>
119
      <import plugin="org.txm.cooccurrence.rcp" version="1.0.0" match="greaterOrEqual"/>
120
      <import plugin="org.eclipse.e4.ui.workbench" version="1.2.2" match="greaterOrEqual"/>
121
      <import plugin="org.txm.internalview.core" version="1.0.0" match="greaterOrEqual"/>
122
      <import plugin="org.txm.internalview.rcp" version="1.0.0" match="greaterOrEqual"/>
123
      <import plugin="org.txm.annotation.rcp" version="1.0.0" match="greaterOrEqual"/>
124
      <import plugin="org.txm.concordance.core" version="1.0.0" match="greaterOrEqual"/>
125
      <import plugin="org.txm.specificities.core" version="1.0.0" match="greaterOrEqual"/>
126
      <import plugin="org.txm.index.core" version="1.0.0" match="greaterOrEqual"/>
127
      <import plugin="org.txm.libs.groovy-all" version="1.0.0" match="greaterOrEqual"/>
90 128
      <import plugin="org.eclipse.osgi.util" version="3.2.0" match="greaterOrEqual"/>
91
      <import plugin="org.eclipse.ui" version="3.6.0" match="greaterOrEqual"/>
92
      <import plugin="org.eclipse.equinox.security.ui" version="1.0.0" match="compatible"/>
93
      <import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
94
      <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
95
      <import plugin="org.eclipse.jface" version="3.9.0" match="compatible"/>
96
      <import plugin="org.eclipse.swt" version="3.101.0" match="compatible"/>
97
      <import plugin="org.eclipse.jface.databinding" version="1.3.0" match="compatible"/>
98
      <import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="compatible"/>
99
      <import plugin="org.eclipse.core.databinding.observable" version="1.2.0" match="compatible"/>
100
      <import plugin="org.eclipse.e4.core.services" version="1.0.0" match="greaterOrEqual"/>
101
      <import plugin="org.eclipse.e4.core.contexts" version="1.0.0" match="greaterOrEqual"/>
102
      <import plugin="org.eclipse.e4.core.di" version="1.1.0" match="greaterOrEqual"/>
103
      <import plugin="org.eclipse.e4.ui.workbench.swt" version="0.9.1" match="greaterOrEqual"/>
104
      <import plugin="org.eclipse.e4.ui.di" version="0.9.0" match="greaterOrEqual"/>
105
      <import plugin="org.eclipse.e4.ui.model.workbench" version="0.9.1" match="greaterOrEqual"/>
106
      <import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.9.0" match="greaterOrEqual"/>
107
      <import plugin="org.eclipse.e4.ui.bindings" version="0.9.0" match="greaterOrEqual"/>
108
      <import plugin="org.eclipse.e4.ui.css.swt" version="0.9.1" match="greaterOrEqual"/>
109
      <import plugin="org.eclipse.e4.ui.css.core" version="0.9.0" match="greaterOrEqual"/>
110
      <import plugin="org.eclipse.e4.ui.workbench3" version="0.12.0" match="greaterOrEqual"/>
111
      <import plugin="org.eclipse.e4.ui.workbench.addons.swt" version="0.10.0" match="greaterOrEqual"/>
112
      <import plugin="org.eclipse.emf.ecore" version="2.7.0" match="greaterOrEqual"/>
113
      <import plugin="org.apache.batik.util" version="1.7.0" match="equivalent"/>
114
      <import plugin="org.apache.batik.util.gui" version="1.7.0" match="equivalent"/>
115
      <import plugin="org.eclipse.ui" version="3.5.0" match="compatible"/>
116
      <import plugin="org.eclipse.core.resources" version="3.4.0" match="compatible"/>
117
      <import plugin="org.eclipse.jface.text" version="3.8.0" match="compatible"/>
118
      <import plugin="org.eclipse.ui.ide" version="3.3.0" match="compatible"/>
119
      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
120
      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.5.0" match="compatible"/>
121
      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
122
      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
123
      <import plugin="org.eclipse.ui.editors" version="3.5.0" match="compatible"/>
124
      <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
125
      <import plugin="org.eclipse.compare.core" version="3.5.0" match="compatible"/>
126
      <import plugin="org.eclipse.equinox.common" version="3.2.0" match="compatible"/>
127
      <import plugin="org.eclipse.equinox.preferences" version="3.2.0" match="compatible"/>
128
      <import plugin="org.eclipse.equinox.registry" version="3.2.0" match="compatible"/>
129
      <import plugin="org.eclipse.core.databinding.observable" version="1.3.0" match="compatible"/>
130
      <import plugin="org.eclipse.core.databinding.property" version="1.3.0" match="compatible"/>
131
      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
132
      <import plugin="org.eclipse.core.runtime" version="3.7.0" match="compatible"/>
133
      <import plugin="org.eclipse.text" version="3.5.0" match="compatible"/>
134
      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="compatible"/>
135
      <import plugin="org.eclipse.osgi" version="3.2.0" match="compatible"/>
136
      <import plugin="org.eclipse.core.filesystem" version="1.3.0" match="compatible"/>
137
      <import plugin="org.eclipse.core.filesystem" version="1.4.0" match="compatible"/>
138
      <import plugin="org.eclipse.equinox.security" version="1.0.0" match="compatible"/>
139
      <import plugin="org.eclipse.equinox.common" version="3.4.0" match="greaterOrEqual"/>
140
      <import plugin="org.eclipse.equinox.preferences" version="3.2.200" match="greaterOrEqual"/>
141
      <import plugin="org.eclipse.osgi" version="3.4.0" match="greaterOrEqual"/>
142
      <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="greaterOrEqual"/>
143
      <import plugin="org.eclipse.core.net" version="1.1.0" match="greaterOrEqual"/>
144
      <import plugin="org.eclipse.core.resources" version="3.5.0" match="compatible"/>
145
      <import plugin="org.eclipse.osgi" version="3.7.0" match="compatible"/>
146
      <import plugin="org.eclipse.equinox.common" version="3.6.100" match="compatible"/>
147
      <import plugin="org.eclipse.core.jobs" version="3.2.0" match="compatible"/>
148
      <import plugin="org.eclipse.equinox.registry" version="3.4.0" match="compatible"/>
149
      <import plugin="org.eclipse.equinox.preferences" version="3.4.0" match="compatible"/>
150
      <import plugin="org.eclipse.core.contenttype" version="3.3.0" match="compatible"/>
151
      <import plugin="org.eclipse.equinox.app" version="1.0.0" match="greaterOrEqual"/>
152
      <import plugin="org.eclipse.equinox.registry" version="3.5.0" match="equivalent"/>
153
      <import plugin="org.eclipse.equinox.common" version="3.6.0" match="compatible"/>
154
      <import plugin="org.eclipse.e4.core.di" version="0.9.0" match="greaterOrEqual"/>
155
      <import plugin="org.eclipse.osgi" version="3.6.0" match="greaterOrEqual"/>
156
      <import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="greaterOrEqual"/>
157
      <import plugin="org.eclipse.osgi.services" version="3.2.100" match="greaterOrEqual"/>
158
      <import plugin="org.eclipse.core.jobs" version="3.5.0" match="greaterOrEqual"/>
159
      <import plugin="org.eclipse.swt" version="3.6.0" match="compatible"/>
160
      <import plugin="org.eclipse.core.commands" version="3.5.0" match="compatible"/>
161
      <import plugin="org.w3c.css.sac" version="1.3.0" match="greaterOrEqual"/>
162
      <import plugin="org.apache.batik.css" version="1.7.0" match="greaterOrEqual"/>
163
      <import plugin="org.eclipse.equinox.common" version="3.5.0" match="compatible"/>
164
      <import plugin="org.eclipse.swt" version="3.4.1" match="compatible"/>
165
      <import plugin="org.eclipse.equinox.registry" version="3.5.0" match="compatible"/>
166
      <import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="compatible"/>
167
      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="greaterOrEqual"/>
168
      <import plugin="org.eclipse.e4.core.di.extensions" version="0.9.0" match="greaterOrEqual"/>
169
      <import plugin="org.eclipse.osgi.services" version="3.2.100" match="compatible"/>
170
      <import plugin="org.eclipse.e4.core.services" version="0.9.0" match="greaterOrEqual"/>
171
      <import plugin="org.eclipse.e4.core.di" version="1.0.0" match="greaterOrEqual"/>
172
      <import plugin="org.eclipse.emf.ecore" version="2.9.0" match="greaterOrEqual"/>
173
      <import plugin="org.eclipse.core.commands" version="3.4.0" match="compatible"/>
174
      <import plugin="org.eclipse.osgi" version="3.6.0" match="compatible"/>
175
      <import plugin="org.eclipse.e4.core.contexts" version="0.9.0" match="greaterOrEqual"/>
176
      <import plugin="org.eclipse.e4.ui.model.workbench" version="1.0.0" match="greaterOrEqual"/>
177
      <import plugin="org.eclipse.equinox.common" version="3.4.0" match="compatible"/>
178
      <import plugin="org.eclipse.osgi" version="3.4.0" match="compatible"/>
179
      <import plugin="org.eclipse.e4.ui.services" version="0.9.0" match="greaterOrEqual"/>
180
      <import plugin="org.eclipse.core.jobs" version="3.4.0" match="compatible"/>
181
      <import plugin="org.eclipse.osgi.services" version="3.2.0" match="compatible"/>
182
      <import plugin="org.eclipse.e4.core.commands" version="0.9.0" match="greaterOrEqual"/>
183
      <import plugin="org.eclipse.emf.ecore.change" version="2.5.0" match="greaterOrEqual"/>
184
      <import plugin="org.eclipse.core.expressions" version="3.4.200" match="compatible"/>
185
      <import plugin="org.eclipse.emf.ecore.xmi" version="2.7.0" match="greaterOrEqual"/>
186
      <import plugin="org.eclipse.e4.ui.workbench" version="0.9.1" match="greaterOrEqual"/>
187
      <import plugin="org.eclipse.e4.core.services" version="0.9.1" match="greaterOrEqual"/>
188
      <import plugin="org.eclipse.e4.ui.workbench.renderers.swt" version="0.9.1" match="greaterOrEqual"/>
189
      <import plugin="org.eclipse.e4.ui.widgets" version="0.11.0" match="greaterOrEqual"/>
190
      <import plugin="org.eclipse.swt" version="3.7.0" match="compatible"/>
191
      <import plugin="org.eclipse.jface" version="3.7.0" match="compatible"/>
192
      <import plugin="org.eclipse.e4.ui.di" version="0.10.0" match="greaterOrEqual"/>
193
      <import plugin="org.eclipse.e4.ui.services" version="1.0.0" match="greaterOrEqual"/>
194
      <import plugin="org.eclipse.e4.ui.workbench" version="0.9.0" match="greaterOrEqual"/>
195
      <import plugin="org.eclipse.swt" version="3.5.0" match="compatible"/>
196
      <import plugin="org.eclipse.jface" version="3.5.0" match="compatible"/>
197
      <import plugin="org.eclipse.e4.ui.workbench.swt" version="0.9.0" match="greaterOrEqual"/>
198
      <import plugin="org.eclipse.e4.ui.model.workbench" version="0.9.0" match="greaterOrEqual"/>
199
      <import plugin="org.eclipse.e4.ui.css.swt" version="0.11.0" match="greaterOrEqual"/>
200
      <import plugin="org.eclipse.e4.ui.workbench.renderers.swt" version="0.10.0" match="compatible"/>
201
      <import plugin="org.eclipse.equinox.app" version="1.3.0" match="compatible"/>
202
      <import plugin="org.eclipse.e4.ui.workbench" version="0.10.0" match="greaterOrEqual"/>
203
      <import plugin="org.eclipse.e4.ui.services" version="0.1.0" match="greaterOrEqual"/>
204
      <import plugin="org.eclipse.core.databinding" version="1.2.0" match="compatible"/>
205
      <import plugin="org.eclipse.e4.ui.css.swt" version="0.9.0" match="greaterOrEqual"/>
206
      <import plugin="org.eclipse.e4.ui.workbench3" version="0.11.0" match="greaterOrEqual"/>
207
      <import plugin="org.eclipse.core.jobs" version="3.5.0" match="compatible"/>
208
      <import plugin="org.eclipse.ecf.provider.filetransfer" version="2.0.0" match="greaterOrEqual"/>
209
      <import plugin="org.eclipse.emf.common" version="2.10.0" match="compatible"/>
210
      <import plugin="org.eclipse.emf.ecore" version="2.10.0" match="compatible"/>
211
      <import plugin="org.eclipse.equinox.common" version="3.6.0" match="greaterOrEqual"/>
212
      <import plugin="org.eclipse.equinox.registry" version="3.5.0" match="greaterOrEqual"/>
213
      <import plugin="org.eclipse.equinox.common" version="3.3.0" match="greaterOrEqual"/>
214
      <import plugin="org.eclipse.equinox.common" version="3.3.0" match="compatible"/>
215
      <import plugin="org.eclipse.core.jobs" version="3.3.0" match="compatible"/>
216
      <import plugin="org.eclipse.equinox.p2.metadata" version="2.0.0" match="compatible"/>
217
      <import plugin="org.sat4j.core" version="2.3.5" match="compatible"/>
218
      <import plugin="org.sat4j.pb" version="2.3.5" match="compatible"/>
219
      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="greaterOrEqual"/>
220
      <import plugin="org.eclipse.equinox.p2.core" version="2.0.0" match="greaterOrEqual"/>
221
      <import plugin="org.eclipse.equinox.p2.discovery" version="1.0.0" match="greaterOrEqual"/>
222
      <import plugin="org.eclipse.equinox.p2.repository" version="2.1.0" match="greaterOrEqual"/>
223
      <import plugin="org.eclipse.equinox.p2.transport.ecf" version="1.0.0" match="greaterOrEqual"/>
224
      <import plugin="org.eclipse.equinox.p2.core" version="2.0.0" match="compatible"/>
225
      <import plugin="org.eclipse.equinox.registry" version="3.3.0" match="greaterOrEqual"/>
226
      <import plugin="org.eclipse.ecf" version="3.1.0" match="greaterOrEqual"/>
227
      <import plugin="org.eclipse.ecf.filetransfer" version="4.0.0" match="greaterOrEqual"/>
228
      <import plugin="org.eclipse.ecf.provider.filetransfer" version="3.1.0" match="greaterOrEqual"/>
229
      <import plugin="org.eclipse.equinox.p2.core" version="2.0.100" match="greaterOrEqual"/>
230
      <import plugin="org.eclipse.core.jobs" version="3.5.100" match="greaterOrEqual"/>
231
      <import plugin="org.eclipse.equinox.p2.discovery" version="1.0.0" match="equivalent"/>
232
      <import plugin="org.eclipse.equinox.p2.ui" version="2.0.0" match="greaterOrEqual"/>
233
      <import plugin="org.eclipse.equinox.p2.operations" version="2.0.0" match="compatible"/>
234
      <import plugin="org.eclipse.equinox.p2.repository" version="2.0.0" match="compatible"/>
235
      <import plugin="org.eclipse.equinox.p2.engine" version="2.0.0" match="compatible"/>
236
      <import plugin="org.eclipse.equinox.p2.metadata.repository" version="0.1.0" match="greaterOrEqual"/>
237
      <import plugin="org.eclipse.equinox.p2.artifact.repository" version="0.1.0" match="greaterOrEqual"/>
238
      <import plugin="org.eclipse.equinox.preferences" version="3.2.200" match="compatible"/>
239
      <import plugin="org.eclipse.ui" version="3.4.0" match="compatible"/>
240
      <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
241
      <import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
242
      <import plugin="org.eclipse.swt" version="3.2.0" match="compatible"/>
243
      <import plugin="org.eclipse.jface" version="3.2.0" match="compatible"/>
244
      <import plugin="org.eclipse.core.runtime" version="3.5.0" match="compatible"/>
245
      <import plugin="org.eclipse.swt" version="3.103.0" match="compatible"/>
246
      <import plugin="org.eclipse.ui.intro" version="3.2.0" match="compatible"/>
247
      <import plugin="org.eclipse.swt" version="3.0.0" match="compatible"/>
248
      <import plugin="org.eclipse.jface" version="3.10.0" match="compatible"/>
249
      <import plugin="org.eclipse.ui.workbench" version="3.105.0" match="compatible"/>
250
      <import plugin="org.eclipse.core.expressions" version="3.4.0" match="compatible"/>
251
      <import plugin="org.eclipse.ui" version="3.6.0" match="compatible"/>
252
      <import plugin="org.eclipse.jface.text" version="3.5.0" match="compatible"/>
253
      <import plugin="org.eclipse.core.variables" version="3.2.800" match="compatible"/>
254
      <import plugin="org.eclipse.ui.ide" version="3.5.0" match="compatible"/>
255
      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.7.0" match="compatible"/>
256
      <import plugin="org.eclipse.core.filebuffers" version="3.5.0" match="compatible"/>
257
      <import plugin="org.eclipse.jface" version="3.6.0" match="compatible"/>
258
      <import plugin="org.eclipse.core.filesystem" version="1.0.0" match="compatible"/>
259
      <import plugin="org.eclipse.ui" version="3.106.0" match="compatible"/>
260
      <import plugin="org.eclipse.ui.workbench" version="3.7.0" match="compatible"/>
261
      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
262
      <import plugin="org.eclipse.equinox.bidi" version="0.10.0"/>
263
      <import plugin="org.eclipse.help" version="3.5.0" match="compatible"/>
264
      <import plugin="org.eclipse.ui.forms" version="3.5.0" match="compatible"/>
265
      <import plugin="org.eclipse.core.expressions" version="3.4.200" match="greaterOrEqual"/>
266
      <import plugin="org.eclipse.ui.ide" version="3.6.0" match="compatible"/>
267
      <import plugin="org.eclipse.core.resources" version="3.6.0" match="compatible"/>
268
      <import plugin="org.eclipse.ui.navigator" version="3.5.0" match="compatible"/>
269
      <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.0" match="compatible"/>
270
      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.6.0" match="compatible"/>
271
      <import plugin="org.eclipse.ltk.core.refactoring" version="3.5.0" match="compatible"/>
272
      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.5.0" match="compatible"/>
273
      <import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
274
      <import plugin="org.eclipse.core.net" version="1.0.0" match="compatible"/>
275
      <import plugin="org.eclipse.ui.forms" version="3.3.0" match="compatible"/>
276
      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
277
      <import plugin="org.eclipse.core.expressions" version="3.4.100" match="compatible"/>
278
      <import plugin="org.w3c.dom.smil" version="1.0.0" match="equivalent"/>
279
      <import plugin="org.eclipse.equinox.launcher" version="1.0.0"/>
129
      <import plugin="org.eclipse.core.net"/>
130
      <import plugin="org.txm.libs.groovy-all" version="2.3.3" match="greaterOrEqual"/>
131
      <import plugin="org.txm.lexicon.core" version="1.0.0" match="greaterOrEqual"/>
132
      <import plugin="org.txm.libs.colt" version="1.2.0" match="greaterOrEqual"/>
133
      <import plugin="org.txm.libs.saxon" version="9.0.0" match="greaterOrEqual"/>
134
      <import plugin="org.txm.partition.core" version="1.0.0" match="greaterOrEqual"/>
135
      <import plugin="org.txm.progression.core" version="1.0.0" match="greaterOrEqual"/>
136
      <import plugin="org.txm.referencer.core" version="1.0.0" match="greaterOrEqual"/>
137
      <import plugin="org.txm.libs.cqp" version="1.0.0" match="greaterOrEqual"/>
138
      <import plugin="org.txm.core" version="0.8.0" match="greaterOrEqual"/>
139
      <import plugin="org.txm.rcp" version="0.8.0" match="greaterOrEqual"/>
140
      <import plugin="org.apache.xerces" version="2.9.0" match="greaterOrEqual"/>
141
      <import plugin="org.eclipse.jface"/>
142
      <import plugin="org.txm.groovy.core" version="1.0.0" match="greaterOrEqual"/>
143
      <import plugin="org.txm.concordance.rcp" version="1.0.0" match="greaterOrEqual"/>
144
      <import plugin="org.txm.chartsengine.svgbatik.rcp" version="1.0.0" match="greaterOrEqual"/>
280 145
      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
146
      <import plugin="org.eclipse.ui.ide"/>
281 147
      <import plugin="org.eclipse.ui.console" version="3.4.0" match="greaterOrEqual"/>
148
      <import plugin="org.eclipse.jface.text"/>
282 149
      <import plugin="org.eclipse.ui.browser" version="3.2.300" match="greaterOrEqual"/>
150
      <import plugin="org.eclipse.ui.forms"/>
151
      <import plugin="org.eclipse.ui.editors"/>
283 152
      <import plugin="org.eclipse.e4.ui.workbench.addons.swt" version="1.0.0" match="greaterOrEqual"/>
284 153
      <import plugin="org.eclipse.equinox.ds" version="1.4.100" match="greaterOrEqual"/>
285 154
      <import plugin="org.eclipse.equinox.event" version="1.3.0" match="greaterOrEqual"/>
......
289 158
      <import plugin="org.eclipse.equinox.p2.ui.sdk.scheduler" version="1.2.0" match="greaterOrEqual"/>
290 159
      <import plugin="org.eclipse.update.configurator" version="3.3.200" match="greaterOrEqual"/>
291 160
      <import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.9.100" match="greaterOrEqual"/>
161
      <import plugin="org.eclipse.e4.ui.css.swt" version="0.11.0" match="greaterOrEqual"/>
292 162
      <import plugin="org.eclipse.e4.ui.css.core" version="0.10.100" match="greaterOrEqual"/>
293 163
      <import plugin="org.eclipse.equinox.p2.updatesite" version="1.0.400" match="greaterOrEqual"/>
294 164
      <import plugin="org.eclipse.platform" version="4.3.0" match="greaterOrEqual"/>
295 165
      <import plugin="org.eclipse.equinox.util" version="1.0.500" match="greaterOrEqual"/>
166
      <import plugin="org.eclipse.equinox.p2.operations"/>
296 167
      <import plugin="org.eclipse.equinox.p2.metadata" version="2.2.0" match="greaterOrEqual"/>
168
      <import plugin="org.eclipse.equinox.p2.director"/>
297 169
      <import plugin="org.eclipse.equinox.p2.ui.discovery" version="1.0.0" match="greaterOrEqual"/>
298 170
      <import plugin="org.eclipse.equinox.p2.discovery" version="1.0.200" match="greaterOrEqual"/>
299 171
      <import plugin="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.101" match="greaterOrEqual"/>
......
302 174
      <import plugin="org.eclipse.equinox.p2.engine" version="2.3.0" match="greaterOrEqual"/>
303 175
      <import plugin="org.eclipse.equinox.p2.console" version="1.0.300" match="greaterOrEqual"/>
304 176
      <import plugin="org.eclipse.ui.net" version="1.2.200" match="greaterOrEqual"/>
177
      <import plugin="org.eclipse.e4.ui.model.workbench"/>
305 178
      <import plugin="org.eclipse.e4.ui.workbench" version="1.0.0" match="greaterOrEqual"/>
306 179
      <import plugin="org.eclipse.e4.core.contexts" version="1.3.0" match="greaterOrEqual"/>
307 180
      <import plugin="org.eclipse.ui.navigator" version="3.5.300" match="greaterOrEqual"/>
308 181
      <import plugin="org.eclipse.ui.navigator.resources" version="3.4.500" match="greaterOrEqual"/>
182
      <import plugin="org.eclipse.e4.ui.di"/>
309 183
      <import plugin="org.eclipse.ui.themes" version="1.0.1" match="greaterOrEqual"/>
310 184
      <import plugin="org.eclipse.core.resources" version="3.9.1" match="greaterOrEqual"/>
311 185
      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.9.0" match="greaterOrEqual"/>
......
314 188
      <import plugin="org.eclipse.osgi.util" version="3.3.0" match="greaterOrEqual"/>
315 189
      <import plugin="org.eclipse.equinox.p2.reconciler.dropins" version="1.1.200" match="greaterOrEqual"/>
316 190
      <import plugin="org.eclipse.ui.views.log" version="1.0.500" match="greaterOrEqual"/>
317
      <import plugin="org.txm.annotation.core"/>
318
      <import plugin="org.txm.ca.core" version="1.0.0" match="greaterOrEqual"/>
319
      <import plugin="org.txm.cah.core" version="1.0.0" match="greaterOrEqual"/>
320
      <import plugin="org.txm.chartsengine.core" version="1.0.0" match="greaterOrEqual"/>
321
      <import plugin="org.txm.chartsengine.jfreechart.core" version="1.0.0" match="greaterOrEqual"/>
322
      <import plugin="org.txm.chartsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
323
      <import plugin="org.txm.concordance.core" version="1.0.0" match="greaterOrEqual"/>
324
      <import plugin="org.txm.cooccurrence.core" version="1.0.0" match="greaterOrEqual"/>
325
      <import plugin="org.txm.groovy.core" version="1.0.0" match="greaterOrEqual"/>
326
      <import plugin="org.txm.index.core" version="1.0.0" match="greaterOrEqual"/>
327
      <import plugin="org.txm.lexicaltable.core" version="1.0.0" match="greaterOrEqual"/>
328
      <import plugin="org.txm.lexicon.core" version="1.0.0" match="greaterOrEqual"/>
329
      <import plugin="org.txm.partition.core" version="1.0.0" match="greaterOrEqual"/>
330
      <import plugin="org.txm.progression.core" version="1.0.0" match="greaterOrEqual"/>
331
      <import plugin="org.txm.referencer.core" version="1.0.0" match="greaterOrEqual"/>
332
      <import plugin="org.txm.searchengine.core" version="1.0.0" match="greaterOrEqual"/>
333
      <import plugin="org.txm.specificities.core" version="1.0.0" match="greaterOrEqual"/>
334
      <import plugin="org.txm.statsengine.core" version="1.0.0" match="greaterOrEqual"/>
335
      <import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
336
      <import plugin="org.txm.links.rcp" version="1.0.0" match="greaterOrEqual"/>
337
      <import plugin="org.txm.searchengine.cqp.rcp" version="1.0.0" match="greaterOrEqual"/>
338
      <import plugin="org.txm.chartsengine.rcp" version="1.0.0" match="greaterOrEqual"/>
339
      <import plugin="org.txm.concordance.rcp" version="1.0.0" match="greaterOrEqual"/>
340
      <import plugin="org.txm.cooccurrence.rcp" version="1.0.0" match="greaterOrEqual"/>
341
      <import plugin="org.txm.index.rcp" version="1.0.0" match="greaterOrEqual"/>
342
      <import plugin="org.txm.internalview.rcp" version="1.0.0" match="greaterOrEqual"/>
343
      <import plugin="org.txm.lexicaltable.rcp" version="1.0.0" match="greaterOrEqual"/>
344
      <import plugin="org.txm.progression.rcp" version="1.0.0" match="greaterOrEqual"/>
345
      <import plugin="org.txm.statsengine.r.rcp" version="1.0.0" match="greaterOrEqual"/>
346
      <import plugin="org.txm.synopticeditor.rcp" version="1.0.0" match="greaterOrEqual"/>
347
      <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
348
      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
349
      <import plugin="org.eclipse.osgi" version="3.10.2" match="greaterOrEqual"/>
350
      <import plugin="org.eclipse.ui" version="3.106.1" match="greaterOrEqual"/>
351
      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
352
      <import plugin="org.txm.rcp" version="0.7.8" match="greaterOrEqual"/>
353
      <import plugin="org.txm.libs.jfreechart" version="1.0.17" match="greaterOrEqual"/>
354
      <import plugin="org.txm.libs.jfreesvg" version="1.7.0" match="greaterOrEqual"/>
355
      <import plugin="org.txm.libs.itext" version="2.1.5" match="greaterOrEqual"/>
356
      <import plugin="org.eclipse.swt" version="3.103.2" match="greaterOrEqual"/>
357
      <import plugin="org.txm.annotation.core" version="1.0.0" match="greaterOrEqual"/>
358
      <import plugin="org.eclipse.e4.ui.workbench" version="1.2.2" match="greaterOrEqual"/>
359
      <import plugin="org.txm.internalview.core" version="1.0.0" match="greaterOrEqual"/>
360
      <import plugin="org.txm.libs.groovy-all" version="2.3.3" match="greaterOrEqual"/>
361
      <import plugin="org.txm.libs.colt" version="1.2.0" match="greaterOrEqual"/>
362
      <import plugin="org.txm.libs.saxon" version="9.0.0" match="greaterOrEqual"/>
363
      <import plugin="org.txm.libs.cqp" version="1.0.0" match="greaterOrEqual"/>
364
      <import plugin="org.txm.core" version="0.8.0" match="greaterOrEqual"/>
365
      <import plugin="org.txm.rcp" version="0.8.0" match="greaterOrEqual"/>
366
      <import plugin="org.apache.xerces" version="2.9.0" match="greaterOrEqual"/>
367
      <import plugin="org.txm.chartsengine.svgbatik.rcp" version="1.0.0" match="greaterOrEqual"/>
368 191
      <import plugin="org.eclipse.core.commands" version="3.6.100" match="greaterOrEqual"/>
369 192
      <import plugin="org.eclipse.ui.workbench" version="3.106.2" match="greaterOrEqual"/>
370 193
      <import plugin="org.txm.libs.colt" version="1.0.0" match="greaterOrEqual"/>
......
738 561
         version="0.0.0"
739 562
         unpack="false"/>
740 563

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

  
741 571
</feature>
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorPart.java (revision 507)
4 4
package org.txm.rcp.editors;
5 5

  
6 6
import org.eclipse.core.runtime.IProgressMonitor;
7
import org.eclipse.core.runtime.IStatus;
8
import org.eclipse.core.runtime.Status;
7 9
import org.eclipse.swt.SWT;
8 10
import org.eclipse.swt.events.SelectionEvent;
9 11
import org.eclipse.swt.events.SelectionListener;
......
19 21
import org.eclipse.ui.IWorkbenchWindow;
20 22
import org.eclipse.ui.PartInitException;
21 23
import org.eclipse.ui.part.EditorPart;
24
import org.txm.core.results.TXMParameters;
22 25
import org.txm.core.results.TXMResult;
23 26
import org.txm.rcp.IImageKeys;
27
import org.txm.rcp.JobsTimer;
28
import org.txm.rcp.StatusLine;
24 29
import org.txm.rcp.TXMWindows;
30
import org.txm.rcp.commands.RestartTXM;
31
import org.txm.rcp.utils.JobHandler;
25 32
import org.txm.rcp.views.corpora.CorporaView;
33
import org.txm.utils.logger.Log;
26 34

  
27 35
/**
28 36
 * Base TXM result <code>EditorPart</code>.
......
75 83
		this.commandParametersGroup = this.initCommandParametersGroup(1);
76 84
		
77 85
		// show the command parameters if the result is not yet computed
78
		this.setVisible(this.commandParametersComposite, (this.getEditorInput().getResult() == null));
86
		this.setVisible(this.commandParametersComposite, this.getEditorInput().getResult().isDirty());
79 87
		
80 88
		this.commandParametersGroup.pack();
81 89
	}
......
111 119
		layout.center = true;
112 120
		group.setLayout(layout);
113 121
		
122
		composite.setLayout(new GridLayout(1, true));
123
		group.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
124
		
114 125
		GridData gd2 = new GridData(GridData.FILL_BOTH);;
115 126
		gd2.grabExcessVerticalSpace = false;
116 127
		gd2.grabExcessHorizontalSpace = true;
......
291 302
	 * Computes and creates or updates the result (from the linked editor input data).
292 303
	 * @param update set if it's an update on an existing result or a creation of a new result 
293 304
	 */
294
	public abstract void computeResult();
305
	public void computeResult() {
306
		final TXMResult result = this.getResultData();
307
		StatusLine.setMessage("Computing "+result.getName());
308
		final TXMParameters parameters = null;//this.getParameters();
309
		final String title = result.getName()+"...";
310
		try {
311
			JobHandler jobhandler = new JobHandler(title, toolBar) {
312
				@Override
313
				protected IStatus run(IProgressMonitor monitor) {
314
					this.runInit(monitor);
315
					try {
316
						JobsTimer.start();
317

  
318
						result.setParameters(parameters);
319

  
320
						if (result.validateParameters() && result.isDirty()) {
321

  
322
							String title = "";//result.getComputingMessage();
323
							System.out.println(title);
324
							Log.info("Start computing Index...");
325

  
326
							//result.compute(monitor);
327
						} else {
328
							return Status.CANCEL_STATUS;
329
						}
330

  
331
						if (monitor.isCanceled())
332
							return Status.CANCEL_STATUS;
333

  
334
						final String message = "";//result.getComputingEndMessage();
335

  
336
						if (monitor.isCanceled())
337
							return Status.CANCEL_STATUS;
338

  
339
						monitor.worked(95);
340
						// refresh ui
341
						syncExec(new Runnable() {
342
							@Override
343
							public void run() {
344

  
345
								System.out.println(message);
346
								StatusLine.setMessage(message);
347

  
348
								refresh();
349

  
350
								RestartTXM.reloadViews();
351
							}
352
						});
353

  
354
					} catch (ThreadDeath td) {
355
						return Status.CANCEL_STATUS;
356
					} catch (Exception e) {
357
						//System.out.println(result.getComputingErrorMessage());
358
						System.out.println(e.getLocalizedMessage());
359
						Log.printStackTrace(e);
360
					} finally {
361
						monitor.done();
362
						JobsTimer.stopAndPrint();
363
					}
364
					return Status.OK_STATUS;
365
				}
366
			};
367
			jobhandler.startJob();
368

  
369
		} catch (Exception e1) {
370
			org.txm.rcp.utils.Logger.printStackTrace(e1);
371
		}
372
	}
295 373
	
296 374
	/**
297 375
	 * The createPartArea method must call this method to initialize the fields values
......
312 390
	 */
313 391
	public void synchronize()	{
314 392
		try {
315
			if (this.getResultData() != null) this.setPartName(this.getResultData().getName());
393
			if (this.getResultData() != null) {
394
				this.setPartName(this.getResultData().getName());
395
			}
316 396
		} catch(Exception e) {
317
			
397
			System.out.println("Error while refreshing editor content: "+e.getLocalizedMessage());
318 398
		}
319 399
	}
320 400
	
tmp/org.txm.rcp/src/main/java/org/txm/rcp/StatusLine.java (revision 507)
66 66
		Display.getDefault().syncExec(new Runnable() {
67 67
			@Override
68 68
			public void run() {
69
				statusLine.setMessage(null, message);
69
				if (statusLine != null)
70
					statusLine.setMessage(null, message);
70 71
			}
71 72
		});
72 73
		
tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java (revision 507)
53 53
import org.osgi.framework.ServiceReference;
54 54
import org.txm.core.preferences.TBXPreferences;
55 55
import org.txm.core.preferences.TXMPreferences;
56
import org.txm.rcp.preferences.RCPPreferences;
57 56
import org.txm.statsengine.r.core.preferences.RPreferences;
58 57
import org.txm.utils.logger.Log;
59 58

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java (revision 507)
55 55

  
56 56
	public static final String UPDATESITE = "http://textometrie.ens-lyon.fr/dist"; //
57 57
	// "file:"+System.getProperty("user.home")+"/TEMP/updates"; // LOCAL TEST ONLY
58
	public static final String ID = "org.txm.rcpapplication.p2.plugins.TXMUpdateHandler";
58
	public static final String ID = "org.txm.rcp.p2.plugins.TXMUpdateHandler";
59 59
	
60 60
	/**
61 61
	 * Execute the command.
tmp/org.txm.rcp/rcpapplication.product (revision 507)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<?pde version="3.5"?>
3 3

  
4
<product name="TXM" uid="org.txm.rcp" id="org.txm.rcp.product" application="org.txm.rcp.Application" version="0.8.0.qualifier" useFeatures="true" includeLaunchers="true">
4
<product name="TXM" uid="org.txm.rcp.app" id="org.txm.rcp.product" application="org.txm.rcp.Application" version="0.8.0.qualifier" useFeatures="true" includeLaunchers="true">
5 5

  
6 6
   <aboutInfo>
7 7
      <image path="/org.txm.rcp/icons/logo/about TXM.png"/>
......
74 74
      <win useIco="false">
75 75
         <bmp
76 76
            winSmallHigh="/org.txm.rcp/icons/logo/TXM logo 16x16 32-bit.bmp"
77
            winSmallLow="/org.txm.rcp/icons/logo/TXM logo 16x16 8-bit.bmp"
78 77
            winMediumHigh="/org.txm.rcp/icons/logo/TXM logo 32x32 32-bit.bmp"
79
            winMediumLow="/org.txm.rcp/icons/logo/TXM logo 32x32 8-bit.bmp"
80
            winLargeHigh="/org.txm.rcp/icons/logo/TXM logo 48x48 32-bit.bmp"
81
            winLargeLow="/org.txm.rcp/icons/logo/TXM logo 48x48 8-bit.bmp"/>
78
            winLargeHigh="/org.txm.rcp/icons/logo/TXM logo 48x48 32-bit.bmp"/>
82 79
      </win>
83 80
   </launcher>
84 81

  
82

  
85 83
   <vm>
84
      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</linux>
85
      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</macos>
86
      <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</solaris>
87
      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows>
86 88
   </vm>
87 89

  
88 90
   <license>
tmp/org.txm.rcp/plugin.xml (revision 507)
3120 3120
            name="Corpora view">
3121 3121
      </context>
3122 3122
   </extension>
3123
   <extension
3124
         point="org.eclipse.ui.intro">
3125
      <intro
3126
            class="org.eclipse.ui.intro.config.CustomizableIntroPart"
3127
            id="org.txm.rcp.intro">
3128
      </intro>
3129
      <introProductBinding
3130
            introId="org.txm.rcp.intro"
3131
            productId="org.txm.rcp.product">
3132
      </introProductBinding>
3133
   </extension>
3134
   <extension
3135
         point="org.eclipse.ui.intro.config">
3136
      <config
3137
            content="introContent.xml"
3138
            id="org.txm.rcp.introConfigId"
3139
            introId="org.txm.rcp.intro">
3140
         <presentation
3141
               home-page-id="root">
3142
            <implementation
3143
                  kind="html"
3144
                  os="win32,linux,macosx"
3145
                  style="content/shared.css">
3146
            </implementation>
3147
         </presentation>
3148
      </config>
3149
   </extension>
3123 3150
</plugin>
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 507)
468 468
	 * @return
469 469
	 */
470 470
	public abstract String getDetails();
471
	
472
//	/**
473
//	 * Gets some details of the result to compute. Shown in progress dialogs.
474
//	 * 
475
//	 * @return the message to show
476
//	 */
477
//	public abstract String getComputingMessage();
471 478

  
472 479
	/**
473 480
	 * Returns a string representation of a unique ID of the result.
tmp/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestImportLangs.java (revision 507)
31 31

  
32 32
public class TestImportLangs extends AbstractHandler {
33 33

  
34
	public static String ID = "org.txm.rcpapplication.commands.tests.TestImports";
34
	public static String ID = "org.txm.rcp.commands.tests.TestImports";
35 35

  
36 36
	static HashMap<String, String> scripts = new HashMap<String, String>();
37 37
	static {

Also available in: Unified diff