Revision 565

tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/functions/LexicalTable.java (revision 565)
240 240
		this.statsData = new LexicalTableImpl(mat, filteredForms.toArray(new String[]{}), partition.getPartShortNames().toArray(new String[] {}));
241 241

  
242 242
	}
243

  
244 243
	
245
	
246 244
	/**
247 245
	 * Creates the lexical table.
248 246
	 *
......
378 376
	}
379 377

  
380 378
	@Override
381
	public boolean setParameters(TXMParameters parameters) {
382
		// TODO Auto-generated method stub
383
		System.err.println("LexicalTable.setParameters(): not yet implemented.");
379
	public boolean setParameters(TXMParameters parameters) throws CqiClientException {
380
		
381
		if (parameters.containsKey(LexicalTablePreferences.F_MIN)) {
382
			this.pfMinFilter = parameters.getInteger(LexicalTablePreferences.F_MIN);
383
		}
384
		if (parameters.containsKey(LexicalTablePreferences.PROPERTY)) {
385
			String s = parameters.get(LexicalTablePreferences.PROPERTY).toString();
386
			this.pProperty = getCorpus().getProperty(s);
387
		}
388
		
389
		if (parameters.containsKey(LexicalTablePreferences.USE_ALL_OCCURRENCES)) {
390
			this.pUseAllOccurrences = parameters.getBoolean(LexicalTablePreferences.USE_ALL_OCCURRENCES);
391
		}
392
		
393
		if (parameters.containsKey(LexicalTablePreferences.V_MAX)) {
394
			this.pVMaxFilter = parameters.getInteger(LexicalTablePreferences.V_MAX);
395
		}
396
		
384 397
		return true;
385 398
	}
386 399

  
387 400
	protected static String getNextName() {
388 401
		return SYMBOL_BASE+(LEXICALTABLE_COUNTER++);
389 402
	}
390

  
391

  
392 403
	
393
	
394 404
	@Override
395 405
	public void clean() {
396 406
		try {
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java (revision 565)
123 123
	AssistedQueryWidget queryWidget;
124 124

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

  
128 128
	/** The empant panel. */
129 129
	EmpantWidget empantPanel;
......
312 312
		filtercontrols.setLayout(layout);
313 313

  
314 314
		// | Properties: word_pos [Edit] |
315
		propsArea = new PropertiesSelector(filtercontrols, SWT.NONE);
315
		propsArea = new PropertiesSelector<Property>(filtercontrols, SWT.NONE);
316 316
		propsArea.setLayout(new GridLayout(4, false));
317 317
		propsArea.setCorpus(this.getCorpus());
318 318
		propsArea.setText(CooccurrenceUIMessages.CooccurrencesEditor_3);
......
444 444
			}
445 445

  
446 446
			@Override
447
			public void widgetDefaultSelected(SelectionEvent e) {
448
			}
447
			public void widgetDefaultSelected(SelectionEvent e) { }
449 448
		});
450 449

  
451 450
		freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
......
460 459
			}
461 460

  
462 461
			@Override
463
			public void widgetDefaultSelected(SelectionEvent e) {
464
			}
462
			public void widgetDefaultSelected(SelectionEvent e) { }
465 463
		});
466 464

  
467 465
		nboccColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
......
476 474
			}
477 475

  
478 476
			@Override
479
			public void widgetDefaultSelected(SelectionEvent e) {
480
			}
477
			public void widgetDefaultSelected(SelectionEvent e) { }
481 478
		});
482 479

  
483 480
		scoreColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
......
492 489
			}
493 490

  
494 491
			@Override
495
			public void widgetDefaultSelected(SelectionEvent e) {
496
			}
492
			public void widgetDefaultSelected(SelectionEvent e) { }
497 493
		});
498 494

  
499 495
		distColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
......
508 504
			}
509 505

  
510 506
			@Override
511
			public void widgetDefaultSelected(SelectionEvent e) {
512
			}
507
			public void widgetDefaultSelected(SelectionEvent e) { }
513 508
		});
514 509

  
515 510
		TableColumn n2Column = new TableColumn(viewer.getTable(), SWT.RIGHT);
......
580 575
		TXMParameters parameters = new TXMParameters();
581 576
		parameters.put(CooccurrencePreferences.QUERY, this.queryWidget.getQueryString());
582 577
		parameters.put(CooccurrencePreferences.PROPERTIES, this.propsArea.getProperties());
583
		parameters.put(CooccurrencePreferences.LIMIT, this.empantPanel.getStruct());
578
		parameters.put(CooccurrencePreferences.STRUCTURE_LIMIT, this.empantPanel.getStruct());
584 579
		parameters.put(CooccurrencePreferences.MAX_LEFT, this.empantPanel.getMaxLeft() + 1);
585 580
		parameters.put(CooccurrencePreferences.MIN_LEFT, this.empantPanel.getMinLeft() + 1);
586 581
		parameters.put(CooccurrencePreferences.MIN_RIGHT, this.empantPanel.getMinRight() + 1);
......
747 742
				RVariablesView.refresh();
748 743

  
749 744
				viewer.getTable().setFocus();
750

  
751 745
				
752
				
753 746
			}
754 747
		});
755

  
756 748
		
757
		
758
		
759 749
		// FIXME: old method
760 750
//		JobHandler jobhandler = new JobHandler(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_12, cooc.getCorpus())) {
761 751
//			@Override
......
933 923
		return this.cooc;
934 924
	}
935 925

  
936

  
937 926
	/**
938 927
	 * Sort.
939 928
	 */
tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java (revision 565)
42 42
import org.apache.commons.lang.StringUtils;
43 43
import org.eclipse.osgi.util.NLS;
44 44
import org.rosuda.REngine.REXPMismatchException;
45
import org.txm.core.results.Parameter;
45 46
import org.txm.core.results.TXMParameters;
46 47
import org.txm.core.results.TXMResult;
47 48
import org.txm.index.core.functions.LineComparator.SortMode;
48 49
import org.txm.index.core.messages.IndexCoreMessages;
50
import org.txm.index.core.preferences.IndexPreferences;
49 51
import org.txm.lexicon.core.corpusengine.cqp.Lexicon;
50 52
import org.txm.searchengine.cqp.CQPEngine;
51 53
import org.txm.searchengine.cqp.ICqiClient;
......
57 59
import org.txm.searchengine.cqp.corpus.Property;
58 60
import org.txm.searchengine.cqp.corpus.QueryResult;
59 61
import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
62
import org.txm.searchengine.cqp.corpus.WordProperty;
60 63
import org.txm.searchengine.cqp.corpus.query.Match;
61 64
import org.txm.searchengine.cqp.corpus.query.Query;
62 65
import org.txm.searchengine.cqp.serverException.CqiServerError;
......
91 94

  
92 95
	/** The partnames. The corpus name if built with a Corpus or the parts names if built with a Partition */
93 96
	protected List<String> partnames = new ArrayList<String>();
97
	
94 98
	/** The fmax filter value parameter. */
99
	@Parameter
95 100
	protected Integer pFmaxFilter = null;
96 101
	/** The fmin filter value parameter. */
102
	@Parameter
97 103
	protected Integer pFminFilter = null;
98 104
	/**	The number of lines shown per page parameter */
105
	@Parameter
99 106
	private Integer pNLinesPerPage = null;
100 107
	/** The word properties shown. */
108
	@Parameter
101 109
	protected List<Property> pProperties;
102 110
	/** The string used to separated property values. */
111
	@Parameter
103 112
	protected String pPropertiesSeparator = "_"; // the separator of properties values //$NON-NLS-1$
104
	private String pPropertySeparator = "_";
105

  
106 113
	/** The CQP query. */
114
	@Parameter
107 115
	protected Query pQuery;
108

  
116
	/** The line index of the current index page. */
117
	@Parameter
109 118
	private Integer pTopIndex;
110

  
111 119
	/** The vmax filter value parameter. */
120
	@Parameter
112 121
	protected Integer pVmaxFilter = null;
113 122
	
114 123
	/** The writer. */
......
177 186
	public Index(Partition partition) {
178 187
		super(partition);
179 188
	}
189
	
180 190
	@Override
181 191
	protected boolean _compute(boolean update) throws Exception {
182 192
		lines.clear();
......
288 298
	}
289 299

  
290 300
	@Override
301
	public boolean saveParameters() {
302
		
303
		if (pFmaxFilter != null) this.setParameterValue(IndexPreferences.FMAX_FILTER, this.pFmaxFilter);
304
		
305
		if (pFminFilter != null) this.setParameterValue(IndexPreferences.FMIN_FILTER, this.pFminFilter);
306
		
307
		if (pNLinesPerPage != null) this.setParameterValue(IndexPreferences.NLINESPERPAGE, this.pNLinesPerPage);
308
		
309
		if (pProperties != null) this.setParameterValue(IndexPreferences.PROPERTIES, WordProperty.fromListToPreferenceString(pProperties));
310
		
311
		if (pPropertiesSeparator != null) this.setParameterValue(IndexPreferences.PROPERTIES_SEPARATOR, this.pPropertiesSeparator);
312
		
313
		if (pQuery != null) this.setParameterValue(IndexPreferences.QUERY, this.pQuery.getQueryString());
314
		
315
		if (pTopIndex != null) this.setParameterValue(IndexPreferences.NTOPINDEX, this.pTopIndex);
316
		
317
		if (pVmaxFilter != null) this.setParameterValue(IndexPreferences.VMAX_FILTER, this.pVmaxFilter);
318
		
319
		return true;
320
	}
321
	
322
	@Override
291 323
	public boolean loadParameters() {
292
		// TODO Auto-generated method stub
293
		System.err.println("Index.loadParameters(): not yet implemented.");
324
		
325
		this.pFmaxFilter = this.getIntParameterValue(IndexPreferences.FMAX_FILTER);
326
		
327
		this.pFminFilter = this.getIntParameterValue(IndexPreferences.FMIN_FILTER);
328
		
329
		this.pNLinesPerPage = this.getIntParameterValue(IndexPreferences.NLINESPERPAGE);
330
		
331
		String s = this.getStringParameterValue(IndexPreferences.PROPERTIES);
332
		this.pProperties = WordProperty.fromStringToList(getCorpus(), s);
333
		
334
		this.pPropertiesSeparator = this.getStringParameterValue(IndexPreferences.PROPERTIES_SEPARATOR);
335
		
336
		this.pQuery = new Query(this.getStringParameterValue(IndexPreferences.QUERY));
337
		
338
		this.pTopIndex = this.getIntParameterValue(IndexPreferences.NTOPINDEX);
339
		
340
		this.pVmaxFilter = this.getIntParameterValue(IndexPreferences.VMAX_FILTER);
341
		
294 342
		return true;
295 343
	}
296

  
297 344
	
298 345
	@Override
299 346
	public void clean() {
......
397 444

  
398 445

  
399 446
	/**
400
	 * remove linen which frequency is not in the [Fmin,Fmax] inverval.
447
	 * remove linen which frequency is not in the [Fmin,Fmax] interval.
401 448
	 *
402 449
	 * @param Fmin the fmin
403 450
	 * @param Fmax the fmax
......
651 698

  
652 699

  
653 700
	public String getPropertySeparator() {
654
		return pPropertySeparator ;
701
		return pPropertiesSeparator ;
655 702
	}
656 703

  
657 704
	/**
tmp/org.txm.index.core/src/org/txm/index/core/preferences/IndexPreferences.java (revision 565)
22 22
	public static final String FMAX_FILTER = "fmax"; //$NON-NLS-1$
23 23
	public static final String VMAX_FILTER = "vmax"; //$NON-NLS-1$
24 24
	public static final String NLINESPERPAGE = "nlines"; //$NON-NLS-1$
25
	public static final String PROPERTIES_SEPARATOR = "properties_separator"; //$NON-NLS-1$
25 26

  
27
	public static final String NTOPINDEX = "n_top_index";
28

  
26 29
	@Override
27 30
	public void initializeDefaultPreferences() {
28 31
	
29 32
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
30
		preferences.put(PROPERTIES, "word");
31
		preferences.put(QUERY, "");
33
		preferences.put(PROPERTIES, "word"); //$NON-NLS-1$
34
		preferences.put(PROPERTIES_SEPARATOR, "_"); //$NON-NLS-1$
35
		preferences.put(QUERY, ""); //$NON-NLS-1$
32 36
		preferences.putInt(FMIN_FILTER, 1);
33 37
		preferences.putInt(FMAX_FILTER, Integer.MAX_VALUE);
34 38
		preferences.putInt(VMAX_FILTER, Integer.MAX_VALUE);
tmp/org.txm.synopticeditor.rcp/src/org/txm/rcp/synoptic/editor/SynopticEditionEditor.java (revision 565)
857 857
	public void updateResultFromEditor() {
858 858
		// nothing to do
859 859
	}
860

  
861
	@Override
862
	public void updateEditorFromResult(boolean update) {
863
		for (EditionPanel panel : editionPanels.values()) {
864
			panel.refresh();
865
		}
866
	}
860 867
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java (revision 565)
144 144
				if (p instanceof StructuralUnitProperty)
145 145
					properties.add((StructuralUnitProperty) p);
146 146

  
147
			if (summary.init(properties)) {
147
			summary.setProperties(properties);
148
			if (summary.compute()) {
148 149
				tv.setContentProvider(new TreeNodeTreeProvider());
149 150
				tv.setLabelProvider(new TreeNodeLabelProvider());
150 151

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java (revision 565)
48 48
 *
49 49
 * @author Sylvain Loiseau
50 50
 */
51
public class SVGGraphicEditor extends TXMEditorPart {
51
public abstract class SVGGraphicEditor extends TXMEditorPart {
52 52

  
53 53
	/** Linking with the OutlineView. */
54 54
	// private OverviewOutlinePage overviewOutlinePage;
......
61 61
	/** The input. */
62 62
	private IEditorInput input;
63 63
	
64
	/** The svgfile. */
64
	/** The svgfile displayed in the editor */
65 65
	private File svgfile;
66 66
	
67 67
	/** The parent. */
68 68
	private Composite parent;
69 69
	
70
	/** The source. */
71
	private TXMResult source;
72

  
73 70
	/** The Constant ID. */
74
	public static final String ID = "org.txm.rcp.editors.SVGGraphicEditor"; //$NON-NLS-1$
71
	public static final String ID = SVGGraphicEditor.class.getName();
75 72

  
76 73
	/**
77 74
	 * Gets the sVG composite.
......
243 240
	public void resetView() {
244 241
		svgComp.resetZoom();
245 242
	}
243
//
244
//	@Override
245
//	public void updateResultFromEditor() {
246
//
247
//	}
246 248

  
247 249
	@Override
248
	public void updateResultFromEditor() {
249
		// TODO Auto-generated method stub
250
		System.err.println("SVGGraphicEditor.updateResultFromEditor(): not yet implemented.");
250
	public void updateEditorFromResult(boolean update) {
251
		// TODO implement a SVGResult extends TXMResult ?		
252
//		svgFile = getResultData().getSVGFile();
253
//		svgComp.setSVGFile(svgfile);
254
		svgComp.redraw();
251 255
	}
252

  
253

  
254 256
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMResultEditorInput.java (revision 565)
126 126
		return false;
127 127
	}
128 128

  
129
	/**
130
	 * Sets and updates the local preferences node qualifier from the result data.
131
	 * Synchronizes the local preferences node with the result data type, etc.
132
	 */
133
	public void syncLocalPreferencesNode()	{
134
		System.err.println("TXMResultEditorInput.syncLocalPreferencesNode(): not yet implemented.");
135
		// FIXME: persistence test
136
//		TXMPreferences.putLocalString(this.result, ChartsEnginePreferences.RESULT_DATA_TYPE, this.result.getClass().getName());
137
	}
129
//	/**
130
//	 * Sets and updates the local preferences node qualifier from the result data.
131
//	 * Synchronizes the local preferences node with the result data type, etc.
132
//	 */
133
//	public void syncLocalPreferencesNode()	{
134
//		System.err.println("TXMResultEditorInput.syncLocalPreferencesNode(): not yet implemented.");
135
//		// FIXME: persistence test
136
////		TXMPreferences.putLocalString(this.result, ChartsEnginePreferences.RESULT_DATA_TYPE, this.result.getClass().getName());
137
//	}
138 138
}
tmp/org.txm.core/src/java/org/txm/core/results/TXMParameters.java (revision 565)
30 30
		   System.out.println("TXMResultParameters.dump(): key = " + key + " / value = " + value);
31 31
		}
32 32
	}
33

  
34
	public Integer getInteger(String key) {
35
		Object v = get(key);
36
		if (v == null) return 0;
37
		else if (v instanceof Integer) return (Integer)v;
38
		else if (v instanceof String) return Integer.parseInt(v.toString());
39
		return 0;
40
	}
41
	
42
	public Float getFloat(String key) {
43
		Object v = get(key);
44
		if (v == null) return 0.0f;
45
		else if (v instanceof Float) return (Float)v;
46
		else if (v instanceof String) return Float.parseFloat(v.toString());
47
		return 0.0f;
48
	}
49

  
50
	public Boolean getBoolean(String key) {
51
		Object v = get(key);
52
		if (v == null) return null;
53
		else if (v instanceof Boolean) return (Boolean)v;
54
		else if (v instanceof String) return Boolean.parseBoolean(v.toString());
55
		return null;
56
	}
33 57
}
tmp/org.txm.core/src/java/org/txm/objects/TxmObject.java (revision 565)
160 160
	 * @param value the value
161 161
	 */
162 162
	public void setAttribute(String key, Serializable value) {
163
		try
164
		{
163
		try {
165 164
			Document doc = getSelfElement().getOwnerDocument();
166 165
			Element prop = doc.createElement("prop"); //$NON-NLS-1$
167 166
			prop.setAttribute("key", key); //$NON-NLS-1$
......
286 285
	
287 286
	@Override
288 287
	public boolean loadParameters() {
289
		// // not implemented in TxmObjects
288
		// not implemented in TxmObjects
290 289
		return false;
291 290
	}
292 291
}
tmp/org.txm.core/src/java/org/txm/stat/utils/ConsoleProgressBar.java (revision 565)
101 101

  
102 102
	@Override
103 103
	public void subTask(String name) {
104
		// FIXME: not yet implemented
105
		System.err.println("ConsoleProgressBar.subTask(): not yet implemented.");
104
		System.out.println("[ "+name+"]");
106 105
	}
107 106

  
108 107
	@Override
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/editors/PartitionDimensionsEditor.java (revision 565)
34 34
		final ToolItem sortByPartSize = new ToolItem(this.getToolBar(), SWT.CHECK);
35 35
		sortByPartSize.setImage(IImageKeys.getImage(this.getClass(), "icons/silk_sort_by_size.png"));
36 36
		sortByPartSize.setToolTipText(PartitionUIMessages.PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE);
37
		sortByPartSize.setSelection(this.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE));
37
		sortByPartSize.setSelection(this.getBooleanParameterValue(PartitionDimensionsPreferences.SORTED_BY_SIZE));
38 38
		
39 39
		sortByPartSize.addSelectionListener(new SelectionListener() {
40 40
			
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java (revision 565)
56 56
		// Charts rendering
57 57
		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(this.getFieldEditorParent(), "Dimensions chart rendering");
58 58
		
59
		this.addField(new BooleanFieldEditor(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE, PartitionUIMessages.PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE, chartsTab));
60
		this.addField(new BooleanFieldEditor(PartitionDimensionsPreferences.CHART_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE, PartitionUIMessages.PreferencesPage_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE, chartsTab));
59
		this.addField(new BooleanFieldEditor(PartitionDimensionsPreferences.SORTED_BY_SIZE, PartitionUIMessages.PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE, chartsTab));
60
		this.addField(new BooleanFieldEditor(PartitionDimensionsPreferences.DISPLAY_PARTS_COUNT_IN_TITLE, PartitionUIMessages.PreferencesPage_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE, chartsTab));
61 61
		
62 62
		// other shared preferences
63 63
		SWTChartsComponentsProvider.createChartsRenderingPreferencesFields(this, chartsTab);
tmp/org.txm.partition.core/src/org/txm/partition/core/preferences/PartitionDimensionsPreferences.java (revision 565)
19 19
	
20 20
	public static final String PREFERENCES_PREFIX = "partition_"; //$NON-NLS-1$
21 21
	
22
	public static final String CHART_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE = PREFERENCES_PREFIX + "chart_dimensions_display_parts_count_in_title"; //$NON-NLS-1$
23
	public static final String CHART_DIMENSIONS_SORTED_BY_SIZE = PREFERENCES_PREFIX + "chart_dimensions_sort_by_parts_size"; //$NON-NLS-1$
22
	public static final String DISPLAY_PARTS_COUNT_IN_TITLE = PREFERENCES_PREFIX + "chart_dimensions_display_parts_count_in_title"; //$NON-NLS-1$
23
	public static final String SORTED_BY_SIZE = PREFERENCES_PREFIX + "chart_dimensions_sort_by_parts_size"; //$NON-NLS-1$
24 24
	
25 25
	@Override
26 26
	public void initializeDefaultPreferences() {
27 27
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
28
		preferences.putBoolean(CHART_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE, true);
29
		preferences.putBoolean(CHART_DIMENSIONS_SORTED_BY_SIZE, false);
28
		preferences.putBoolean(DISPLAY_PARTS_COUNT_IN_TITLE, true);
29
		preferences.putBoolean(SORTED_BY_SIZE, false);
30 30
		
31 31
		// shared charts rendering preferences
32 32
		ChartsEnginePreferences.initializeChartsEngineSharedPreferences(preferences);
tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java (revision 565)
11 11

  
12 12
import org.txm.chartsengine.core.results.ChartResult;
13 13
import org.txm.core.preferences.TXMPreferences;
14
import org.txm.core.results.Parameter;
14 15
import org.txm.core.results.TXMParameters;
15 16
import org.txm.partition.core.messages.PartitionCoreMessages;
16 17
import org.txm.partition.core.preferences.PartitionDimensionsPreferences;
......
27 28
 */
28 29
public class PartitionDimensions extends ChartResult {
29 30

  
31
	/** if true the part bars are sorted by size. */
32
	@Parameter
33
	protected Boolean pSortBySize;
30 34
	
31
	
32 35
	/**
33 36
	 * Creates a partition dimensions result from the specified <link>Partition</link>.
34 37
	 */
......
59 62
	@Override
60 63
	public boolean setParameters(TXMParameters parameters) {
61 64
		try {
62
			this.setParameters((boolean)parameters.get(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE));
65
			this.setParameters((boolean)parameters.get(PartitionDimensionsPreferences.SORTED_BY_SIZE));
63 66
			return true;
64 67
		}
65 68
		catch(Exception e) {
......
69 72
		return false;
70 73
	}
71 74

  
72

  
73 75
	/**
74 76
	 * 
75 77
	 * @param sortByPartSize
76 78
	 */
77 79
	public void setParameters(boolean sortByPartSize)	{
78
		TXMPreferences.putLocal(this, PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE, sortByPartSize);
80
		pSortBySize = sortByPartSize;
79 81
		this.setDirty();
80 82
		this.setChartDirty();
81 83
	}
82 84

  
83 85
	@Override
84 86
	public boolean loadParameters() {
85
		// TODO Auto-generated method stub
86
		System.err.println("PartitionDimensions.loadParameters(): not yet implemented.");
87
		pSortBySize = getBooleanParameterValue(PartitionDimensionsPreferences.SORTED_BY_SIZE);
87 88
		return true;
88 89
	}
90
	
91
	@Override
92
	public boolean saveParameters() {
93
		if (pSortBySize != null) setParameterValue(PartitionDimensionsPreferences.SORTED_BY_SIZE, pSortBySize);
94
		return true;
95
	}
89 96

  
90 97
	
91 98
	/**
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsBarChartCreator.java (revision 565)
63 63
		
64 64
		
65 65
		// parameters
66
		boolean sortPartsBySize = result.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE);
67
		boolean displayPartsCountInTitle = result.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE);
66
		boolean sortPartsBySize = result.getBooleanParameterValue(PartitionDimensionsPreferences.SORTED_BY_SIZE);
67
		boolean displayPartsCountInTitle = result.getBooleanParameterValue(PartitionDimensionsPreferences.DISPLAY_PARTS_COUNT_IN_TITLE);
68 68
		
69 69
		// Fill the data set
70 70
		XYSeriesCollection dataset = (XYSeriesCollection) jfcChart.getXYPlot().getDataset();
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsPieChartCreator.java (revision 565)
29 29
		PartitionDimensions partitionDimensions = (PartitionDimensions) result;
30 30
		
31 31
		// parameters
32
		boolean sortPartsBySize = result.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE);
33
		boolean displayPartsCountInTitle = result.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE);
32
		boolean sortPartsBySize = result.getBooleanParameterValue(PartitionDimensionsPreferences.SORTED_BY_SIZE);
33
		boolean displayPartsCountInTitle = result.getBooleanParameterValue(PartitionDimensionsPreferences.DISPLAY_PARTS_COUNT_IN_TITLE);
34 34

  
35 35
		
36 36
		JFreeChart chart = null;
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsBarChartCreator.java (revision 565)
30 30
			PartitionDimensions partitionDimensions = (PartitionDimensions) result;
31 31
			
32 32
			// parameters
33
			boolean sortPartsBySize = result.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE);
34
			boolean displayPartsCountInTitle = result.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE);
33
			boolean sortPartsBySize = result.getBooleanParameterValue(PartitionDimensionsPreferences.SORTED_BY_SIZE);
34
			boolean displayPartsCountInTitle = result.getBooleanParameterValue(PartitionDimensionsPreferences.DISPLAY_PARTS_COUNT_IN_TITLE);
35 35
			
36 36
			List<Part> parts = partitionDimensions.getParts(sortPartsBySize);
37 37
			
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsPieChartCreator.java (revision 565)
31 31
			PartitionDimensions partitionDimensions = (PartitionDimensions) result;
32 32

  
33 33
			// parameters
34
			boolean sortPartsBySize = result.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE);
35
			boolean displayPartsCountInTitle = result.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE);
34
			boolean sortPartsBySize = result.getBooleanParameterValue(PartitionDimensionsPreferences.SORTED_BY_SIZE);
35
			boolean displayPartsCountInTitle = result.getBooleanParameterValue(PartitionDimensionsPreferences.DISPLAY_PARTS_COUNT_IN_TITLE);
36 36
			
37 37
			List<Part> parts = partitionDimensions.getParts(sortPartsBySize);
38 38
			
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java (revision 565)
47 47
import org.txm.cooccurrence.core.functions.comparators.CLineComparator;
48 48
import org.txm.cooccurrence.core.messages.CooccurrenceCoreMessages;
49 49
import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
50
import org.txm.core.results.Parameter;
50 51
import org.txm.core.results.TXMParameters;
51 52
import org.txm.core.results.TXMResult;
52 53
import org.txm.index.core.functions.Index;
......
58 59
import org.txm.searchengine.cqp.corpus.Property;
59 60
import org.txm.searchengine.cqp.corpus.QueryResult;
60 61
import org.txm.searchengine.cqp.corpus.StructuralUnit;
62
import org.txm.searchengine.cqp.corpus.WordProperty;
61 63
import org.txm.searchengine.cqp.corpus.query.Match;
62 64
import org.txm.searchengine.cqp.corpus.query.Query;
63 65
import org.txm.searchengine.cqp.serverException.CqiServerError;
......
159 161
	/** The P. */
160 162
	int P = -1;
161 163

  
164
	@Parameter
162 165
	String pCooccurentQueryFilter = "[]"; //$NON-NLS-1$
163 166
	/** The mincof. */
167
	@Parameter
164 168
	private int pFCoocFilter;
165 169
	/** The minf. */
170
	@Parameter
166 171
	private int pFminFilter;
167 172
	/** The include xpivot. */
173
	@Parameter
168 174
	private boolean pIncludeXpivot;
169 175
	/** The maxleft. */
176
	@Parameter
170 177
	int pMaxLeftContextSize;
171 178
	/** The maxright. */
179
	@Parameter
172 180
	int pMaxRightContextSize;
173 181
	/** The minleft. */
182
	@Parameter
174 183
	int pMinLeftContextSize = 1;
175 184
	/** The minright. */
185
	@Parameter
176 186
	int pMinRightContextSize = 1;
177 187
	/** The cooccurents properties to show. */
188
	@Parameter
178 189
	List<Property> pProperties;
179 190
	/** The keyword query. */
191
	@Parameter
180 192
	Query pQuery;
181 193
	/** The minscore. */
194
	@Parameter
182 195
	private double pScoreMinFilter;
183

  
184 196
	/** The structural unit context limit. */
197
	@Parameter
185 198
	StructuralUnit pStructuralUnitLimit;
186 199

  
187 200
	/** The reference corpus to use = the R symbol that point to a matrix WordxFreqs. */
......
259 272
				return false;
260 273
			}
261 274
			this.worked(10);
262
		}
263
		catch(Exception e) {
275
			
276
		} catch(Exception e) {
264 277
			e.printStackTrace();
265 278
			return false;
266 279
		}
......
434 447
		}
435 448
	}
436 449

  
437
	//	/**
438
	//	 * Compute.
439
	//	 *
440
	//	 * @return true, if successful
441
	//	 */
442
	//	//FIXME: not used? or may in portal? in any case, need to use other method compute() now
443
	//	public boolean compute() {
444
	//		if (conclines == null || concordance == null || P == -1 || FA == -1
445
	//				|| properties == null || corpus == null) {
446
	//			System.err.println(CooccurrenceCoreMessages.Cooccurrence_5 + concordance);
447
	//			return false;
448
	//		}
449
	//		// System.out.println("seuils: freq="+seuil_freq+", count="+seuil_count+", score="+seuil_score);
450
	//		String queryfreq = "["; //$NON-NLS-1$
451
	//		for (Property p : properties) {
452
	//			queryfreq += " " + p.getName() + "=\".*\" |"; //$NON-NLS-1$ //$NON-NLS-2$
453
	//		}
454
	//		queryfreq = queryfreq.substring(0, queryfreq.length() - 1) + "]"; //$NON-NLS-1$
455
	//		try {
456
	//			index = new Index(corpus, new Query(queryfreq), properties);
457
	//		} catch (Exception e){
458
	//			Log.severe("Error while computing Index for the cooccurrence: "+e.getLocalizedMessage());
459
	//			return false;
460
	//		}
461
	//		// voc.getCorpus().storeResult(voc);
462
	//
463
	//		count = new HashMap<String, Integer>(index.getV());
464
	//		dist = new HashMap<String, Float>(index.getV());
465
	//		freq = new HashMap<String, Integer>(index.getV());
466
	//		scores = new HashMap<String, Double>(index.getV());
467
	//		occproperties = new HashMap<String, List<String>>(index.getV());
468
	//
469
	//		// System.out.println("Lignes");
470
	//		// System.out.println("leftC\tKeyword\trightC");
471
	//		for (Line concline : conclines) {
472
	//			// System.out.println(concline.leftContextToString()+"\t"+concline.keywordToString()+"\t"+concline.rightContextToString());
473
	//			Map<Property, List<String>> propsvalue = concline
474
	//					.getLeftCtxViewProperties();
475
	//			countOcc(propsvalue, false);
476
	//			propsvalue = concline.getRightCtxViewProperties();
477
	//			countOcc(propsvalue, true);
478
	//		}
479
	//
480
	//		for (String cooc : count.keySet()) {
481
	//			if (count.get(cooc) >= seuil_count && freq.get(cooc) >= seuil_freq) {
482
	//				// System.out.println("compute dist et score de : "+cooc);
483
	//				// calcul dist moyenne avant de rectif ier count
484
	//				dist.put(cooc, dist.get(cooc) / count.get(cooc));
485
	//
486
	//				if (count.get(cooc) > freq.get(cooc))
487
	//					count.put(cooc, freq.get(cooc));
488
	//
489
	//				// calcul score du cooc
490
	//				double score = ProbaBinom(FA, freq.get(cooc), P,
491
	//						count.get(cooc));
492
	//				if (score >= seuil_score) {
493
	//					long mode = calcmode(FA, freq.get(cooc), P, count.get(cooc));
494
	//					CLine line = new CLine(this, cooc, occproperties.get(cooc),
495
	//							count.get(cooc), freq.get(cooc), score, dist
496
	//							.get(cooc), mode);
497
	//					lines.add(line);
498
	//				}
499
	//			}
500
	//		}
501
	//
502
	//		// clear memory
503
	//		count = null;
504
	//		dist = null;
505
	//		freq = null;
506
	//		scores = null;
507
	//		occproperties = null;
508
	//
509
	//		return true;
510
	//	}
511

  
512 450
	/**
513 451
	 * Gets the corpus.
514 452
	 *
......
834 772
			boolean includeXpivot = (Boolean) this.getBooleanParameterValue(CooccurrencePreferences.INCLUDE_X_PIVOT);
835 773
			Query query = new Query(parameters.get(CooccurrencePreferences.QUERY).toString());
836 774

  
837
			StructuralUnit limit = corpus.getStructuralUnit(this.getStringParameterValue(CooccurrencePreferences.LIMIT));
775
			StructuralUnit limit = corpus.getStructuralUnit(this.getStringParameterValue(CooccurrencePreferences.STRUCTURE_LIMIT));
838 776

  
839 777
			Object propsParam = parameters.get(CooccurrencePreferences.PROPERTIES);
840 778
			List<Property> properties = null;
......
1307 1245
	 *
1308 1246
	 * @return true, if successful
1309 1247
	 */
1310
	public boolean stepQueryLimits()
1311
	{
1248
	public boolean stepQueryLimits() {
1312 1249
		if (pStructuralUnitLimit != null) // structural context
1313 1250
		{
1314 1251
			String tempquery =""; //$NON-NLS-1$
......
1497 1434
		 * @return the cooc
1498 1435
		 */
1499 1436
		public Cooccurrence getCooc() {
1500

  
1501 1437
			return cooc;
1502 1438
		}
1503 1439

  
......
1537 1473
		 * Sets the score.
1538 1474
		 */
1539 1475
		public void setScore() {// FB == freq, R = nbocc
1540

  
1541 1476
			this.score = (this.nbocc + this.freq + this.distmoyenne);
1542 1477
		}
1543 1478

  
......
1552 1487
	
1553 1488
	
1554 1489
	@Override
1555
	public boolean loadParameters() {
1556
		System.err.println("Cooccurrence.loadParameters(): not yet implemented.");
1490
	public boolean loadParameters() throws CqiClientException {
1491
		
1492
		pCooccurentQueryFilter = this.getStringParameterValue(CooccurrencePreferences.COOCQUERYFILTER);
1493
		pFCoocFilter = this.getIntParameterValue(CooccurrencePreferences.MIN_COUNT);
1494
		pFminFilter = this.getIntParameterValue(CooccurrencePreferences.MIN_FREQ);
1495
		pIncludeXpivot  = this.getBooleanParameterValue(CooccurrencePreferences.INCLUDE_X_PIVOT);
1496
		pMaxLeftContextSize = this.getIntParameterValue(CooccurrencePreferences.MAX_LEFT);
1497
		pMaxRightContextSize = this.getIntParameterValue(CooccurrencePreferences.MAX_RIGHT);
1498
		pMinLeftContextSize = this.getIntParameterValue(CooccurrencePreferences.MIN_LEFT);
1499
		pMinRightContextSize = this.getIntParameterValue(CooccurrencePreferences.MIN_RIGHT);
1500
		
1501
		String s = this.getStringParameterValue(CooccurrencePreferences.PROPERTIES);
1502
		pProperties = WordProperty.fromStringToList(getCorpus(), s);
1503
		
1504
		pQuery = new Query(this.getStringParameterValue(CooccurrencePreferences.QUERY));
1505
		pScoreMinFilter = this.getIntParameterValue(CooccurrencePreferences.MIN_SCORE);
1506
		
1507
		s = this.getStringParameterValue(CooccurrencePreferences.STRUCTURE_LIMIT);
1508
		pStructuralUnitLimit = getCorpus().getStructuralUnit(s);
1509
		
1557 1510
		return true;
1558 1511
	}
1559 1512
	
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/CooccurrenceMaths.java (revision 565)
154 154
		return (long) Math.floor((double) ((inf + 1) * (ing + 1))
155 155
				/ (inf + ing + s + 2));
156 156
	}
157
	
158

  
159
	//	/**
160
	//	 * Compute.
161
	//	 *
162
	//	 * @return true, if successful
163
	//	 */
164
	//	//FIXME: not used? or may in portal? in any case, need to use other method compute() now
165
	//	public boolean compute() {
166
	//		if (conclines == null || concordance == null || P == -1 || FA == -1
167
	//				|| properties == null || corpus == null) {
168
	//			System.err.println(CooccurrenceCoreMessages.Cooccurrence_5 + concordance);
169
	//			return false;
170
	//		}
171
	//		// System.out.println("seuils: freq="+seuil_freq+", count="+seuil_count+", score="+seuil_score);
172
	//		String queryfreq = "["; //$NON-NLS-1$
173
	//		for (Property p : properties) {
174
	//			queryfreq += " " + p.getName() + "=\".*\" |"; //$NON-NLS-1$ //$NON-NLS-2$
175
	//		}
176
	//		queryfreq = queryfreq.substring(0, queryfreq.length() - 1) + "]"; //$NON-NLS-1$
177
	//		try {
178
	//			index = new Index(corpus, new Query(queryfreq), properties);
179
	//		} catch (Exception e){
180
	//			Log.severe("Error while computing Index for the cooccurrence: "+e.getLocalizedMessage());
181
	//			return false;
182
	//		}
183
	//		// voc.getCorpus().storeResult(voc);
184
	//
185
	//		count = new HashMap<String, Integer>(index.getV());
186
	//		dist = new HashMap<String, Float>(index.getV());
187
	//		freq = new HashMap<String, Integer>(index.getV());
188
	//		scores = new HashMap<String, Double>(index.getV());
189
	//		occproperties = new HashMap<String, List<String>>(index.getV());
190
	//
191
	//		// System.out.println("Lignes");
192
	//		// System.out.println("leftC\tKeyword\trightC");
193
	//		for (Line concline : conclines) {
194
	//			// System.out.println(concline.leftContextToString()+"\t"+concline.keywordToString()+"\t"+concline.rightContextToString());
195
	//			Map<Property, List<String>> propsvalue = concline
196
	//					.getLeftCtxViewProperties();
197
	//			countOcc(propsvalue, false);
198
	//			propsvalue = concline.getRightCtxViewProperties();
199
	//			countOcc(propsvalue, true);
200
	//		}
201
	//
202
	//		for (String cooc : count.keySet()) {
203
	//			if (count.get(cooc) >= seuil_count && freq.get(cooc) >= seuil_freq) {
204
	//				// System.out.println("compute dist et score de : "+cooc);
205
	//				// calcul dist moyenne avant de rectif ier count
206
	//				dist.put(cooc, dist.get(cooc) / count.get(cooc));
207
	//
208
	//				if (count.get(cooc) > freq.get(cooc))
209
	//					count.put(cooc, freq.get(cooc));
210
	//
211
	//				// calcul score du cooc
212
	//				double score = ProbaBinom(FA, freq.get(cooc), P,
213
	//						count.get(cooc));
214
	//				if (score >= seuil_score) {
215
	//					long mode = calcmode(FA, freq.get(cooc), P, count.get(cooc));
216
	//					CLine line = new CLine(this, cooc, occproperties.get(cooc),
217
	//							count.get(cooc), freq.get(cooc), score, dist
218
	//							.get(cooc), mode);
219
	//					lines.add(line);
220
	//				}
221
	//			}
222
	//		}
223
	//
224
	//		// clear memory
225
	//		count = null;
226
	//		dist = null;
227
	//		freq = null;
228
	//		scores = null;
229
	//		occproperties = null;
230
	//
231
	//		return true;
232
	//	}
157 233
}
tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/preferences/CooccurrencePreferences.java (revision 565)
24 24
	/** The Constant SCOREFORMAT. */
25 25
	public static final String SCORE_FORMAT = PREFERENCES_PREFIX + "score_format"; //$NON-NLS-1$
26 26
	
27
	public static final String LIMIT = PREFERENCES_PREFIX + "limit"; //$NON-NLS-1$
27
	public static final String STRUCTURE_LIMIT = PREFERENCES_PREFIX + "structure_limit"; //$NON-NLS-1$
28 28
	public static final String PROPERTIES = PREFERENCES_PREFIX + "properties"; //$NON-NLS-1$
29 29

  
30 30
	/** The Constant MINFREQ. */
......
47 47
	// local result preferences
48 48
	public static final String QUERY = PREFERENCES_PREFIX + "query"; //$NON-NLS-1$
49 49

  
50
	public static final String COOCQUERYFILTER = PREFERENCES_PREFIX + "cooc_query_filter"; //$NON-NLS-1$
51

  
50 52
	
51 53
	/**
52 54
	 * 
tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java (revision 565)
871 871
	public Query getQuery() {
872 872
		return queryWidget.getQuery();
873 873
	}
874

  
875

  
876 874
}
tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/diagnostic/Diagnostic.java (revision 565)
45 45
import org.txm.core.messages.TXMCoreMessages;
46 46
import org.txm.core.preferences.TBXPreferences;
47 47
import org.txm.core.preferences.TXMPreferences;
48
import org.txm.core.results.Parameter;
48 49
import org.txm.core.results.TXMParameters;
49 50
import org.txm.core.results.TXMResult;
50 51
import org.txm.objects.Base;
......
75 76
	Partition partition;
76 77
	
77 78
	/** The maxvalue. */
78
	int pMaxValue = 20;
79
	@Parameter
80
	Integer pMaxValue = 20;
79 81
	
80 82
	// Numbers
81 83
	/** The T. */
......
660 662

  
661 663
	@Override
662 664
	public boolean setParameters(TXMParameters parameters) {
663
		// TODO Auto-generated method stub
664
		System.err.println("Diagnostic.setParameters(): not yet implemented.");
665
		
666
		pMaxValue = parameters.getInteger(CQPPreferences.MAXVALUE);
667
		
665 668
		return true;
666 669
	}
667 670

  
668 671
	@Override
669 672
	public boolean loadParameters() {
670
		// TODO Auto-generated method stub
671
		System.err.println("Diagnostic.loadParameters(): not yet implemented.");
673
		pMaxValue = this.getIntParameterValue(CQPPreferences.MAXVALUE);
672 674
		return true;
673 675
	}
674 676
	
675
	
677
	@Override
678
	public boolean saveParameters() {
679
		if (pMaxValue != null) this.setParameterValue(CQPPreferences.MAXVALUE, pMaxValue);
680
		return true;
681
	}
676 682
}
tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/summary/Summary.java (revision 565)
36 36
		return treenodes;
37 37
	}
38 38

  
39
	public boolean init(ArrayList<StructuralUnitProperty> properties) throws CqiClientException, IOException, CqiServerError
39
	public boolean compute() throws CqiClientException, IOException, CqiServerError
40 40
	{
41
		this.properties = properties;
42 41
		treenodes.end = corpus.getSize();
43 42
		treenodes.id = corpus.getName();
44 43
		treenodes.start = 0;
......
261 260

  
262 261
	@Override
263 262
	public boolean canCompute() {
264
		return corpus != null;
263
		return corpus != null && properties != null && properties.size() > 0;
265 264
	}
266 265

  
267 266
	@Override
......
291 290
		return false;
292 291
	}
293 292

  
293
	public void setProperties(ArrayList<StructuralUnitProperty> properties2) {
294
		this.properties = properties;
295
	}
294 296
}
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/WordProperty.java (revision 565)
3 3
import java.util.ArrayList;
4 4
import java.util.List;
5 5

  
6
import org.apache.commons.lang.StringUtils;
6 7
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
7 8

  
8 9
/**
......
47 48
		}
48 49
		return properties;
49 50
	}
51

  
52
	public static String fromListToPreferenceString(List<Property> pProperties) {
53
		ArrayList<String> names = new ArrayList<String>();
54
		for (Property p : pProperties) {
55
			names.add(p.getName());
56
		}
57
		return StringUtils.join(names, "\t");
58
	}
50 59
}
tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/AbsoluteFrequency.java (revision 565)
53 53
	public boolean canCompute() {
54 54
		return itable != null;
55 55
	}
56

  
57
	@Override
58
	public boolean setParameters(TXMParameters parameters) {
59
		// TODO Auto-generated method stub
60
		System.err.println("AbsoluteFrequency.setParameters(): not yet implemented.");
61
		return true;
62
	}
63

  
64
	@Override
65
	public boolean loadParameters() {
66
		// TODO Auto-generated method stub
67
		System.err.println("AbsoluteFrequency.loadParameters(): not yet implemented.");
68
		return true;
69
	}
70

  
71 56
}
tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Chi2.java (revision 565)
56 56
	public boolean canCompute() {
57 57
		return itable != null;
58 58
	}
59

  
60
	@Override
61
	public boolean setParameters(TXMParameters parameters) {
62
		// TODO Auto-generated method stub
63
		System.err.println("Chi2.setParameters(): not yet implemented.");
64
		return true;
65
	}
66

  
67
	@Override
68
	public boolean loadParameters() {
69
		// TODO Auto-generated method stub
70
		System.err.println("Chi2.loadParameters(): not yet implemented.");
71
		return true;
72
	}
73

  
74 59
	
75 60
}
tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Specificites2.java (revision 565)
53 53
	public boolean canCompute() {
54 54
		return itable != null;
55 55
	}
56

  
57
	@Override
58
	public boolean setParameters(TXMParameters parameters) {
59
		// TODO Auto-generated method stub
60
		System.err.println("Specificites2.setParameters(): not yet implemented.");
61
		return true;
62
	}
63

  
64

  
65
	@Override
66
	public boolean loadParameters() {
67
		// TODO Auto-generated method stub
68
		System.err.println("Specificites2.loadParameters(): not yet implemented.");
69
		return true;
70
	}
71

  
72 56
}
tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrast.java (revision 565)
8 8
import java.io.UnsupportedEncodingException;
9 9

  
10 10
import org.txm.chartsengine.r.core.themes.DefaultTheme;
11
import org.txm.core.results.TXMParameters;
11 12
import org.txm.core.results.TXMResult;
12 13
import org.txm.lexicaltable.core.functions.LexicalTable;
13 14
import org.txm.lexicaltable.core.functions.LexicalTableFactory;
......
263 264
			throw new StatException(e);
264 265
		}
265 266
	}
267
	
268
	@Override
269
	public boolean setParameters(TXMParameters parameters) {
270
		// TODO Auto-generated method stub
271
		System.err.println("Contrast.setParameters(): not yet implemented.");
272
		return true;
273
	}
274

  
275
	@Override
276
	public boolean loadParameters() {
277
		// TODO Auto-generated method stub
278
		System.err.println("Contrast.loadParameters(): not yet implemented.");
279
		return true;
280
	}
281

  
266 282
}
tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/RelativeFrequency.java (revision 565)
55 55
	public boolean canCompute() {
56 56
		return itable != null;
57 57
	}
58

  
59
	@Override
60
	public boolean setParameters(TXMParameters parameters) {
61
		// TODO Auto-generated method stub
62
		System.err.println("RelativeFrequency.setParameters(): not yet implemented.");
63
		return true;
64
	}
65

  
66
	@Override
67
	public boolean loadParameters() {
68
		// TODO Auto-generated method stub
69
		System.err.println("RelativeFrequency.loadParameters(): not yet implemented.");
70
		return true;
71
	}
72

  
73 58
}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java (revision 565)
627 627
		
628 628
		QueriesView.refresh();
629 629
		RVariablesView.refresh();
630

  
631 630
	}
632 631

  
633 632
	 

Also available in: Unified diff