Revision 573

tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 573)
42 42
import org.txm.core.results.Parameter;
43 43
import org.txm.core.results.TXMParameters;
44 44
import org.txm.progression.core.messages.ProgressionCoreMessages;
45
import org.txm.progression.core.preferences.ProgressionPreferences;
45 46
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
46 47
import org.txm.searchengine.cqp.corpus.Corpus;
47 48
import org.txm.searchengine.cqp.corpus.CorpusManager;
......
125 126
	/**
126 127
	 * The queries.
127 128
	 */
128
	@Parameter
129
	@Parameter(key=ProgressionPreferences.QUERIES)
129 130
	protected List<Query> queries;
130 131

  
131 132

  
......
169 170
		return true;
170 171
	}
171 172

  
173
	
174
	
172 175
	@Override
173 176
	public boolean loadParameters() {
174
		// TODO Auto-generated method stub
175
		System.err.println("Progression.loadParameters(): not yet implemented.");
177
		// FIXME:
178
		System.err.println("Progression.loadParameters(): partially implemented.");
179
		
180
		this.repeatValues = this.getBooleanParameterValue(ProgressionPreferences.CHART_REPEAT_VALUES);
181
		this.bandeMultiplier = this.getFloatParameterValue(ProgressionPreferences.CHART_BANDE_MULTIPLIER);
182
		
183
		
176 184
		return true;
177 185
	}
186
		
178 187

  
179 188
	
180 189
	/**
......
194 203
		this.property = structuralUnitProperty;
195 204
	}
196 205
	
197
// FIXME	
198
//	@Override
199
//	public void loadParameters() {
200
//		// FIXME:
201
//		System.err.println("Progression.loadParameters(): partially implemented.");
202
//		
203
//		this.repeatValues = this.getBooleanParameterValue(ProgressionPreferences.CHART_REPEAT_VALUES);
204
//		this.bandeMultiplier = this.getFloatParameterValue(ProgressionPreferences.CHART_BANDE_MULTIPLIER);
205
//	}
206
	
207 206
	/**
208 207
	 * 
209 208
	 * @param queries
......
245 244
	 * @throws IOException 
246 245
	 */
247 246
	protected boolean _compute(boolean update) throws Exception {
248
		
249
		if(!update)	{
247

  
248
		// Queries
249
		if(this.parameterHasChanged(ProgressionPreferences.QUERIES))	{
250 250
			this.allPositions = new ArrayList<int[]>();
251 251
			this.structurePositions = new int[0];
252 252
			this.structureNames = new String[0];
253 253
			
254
			this.subTask("processing queries");
254
			this.subTask("Processing queries.");
255 255
			if (!stepQueries()) {
256 256
				System.out.println(ProgressionCoreMessages.ComputeProgression_3);
257 257
				return false;
......
263 263
			this.worked(10);
264 264
		}
265 265
		
266
		
267
		this.subTask("processing structural units");
266
		// Structural units
267
		this.subTask("Processing structural units.");
268 268
		if (!stepStructuralUnits())	{
269 269
			return false;
270 270
		}
271 271
		this.worked(20);
272 272

  
273 273
		
274
		if(!update)	{
275
			this.subTask("finalizing");
274
		// Finalization steps
275
		if(this.parameterHasChanged(ProgressionPreferences.QUERIES))	{
276
			this.subTask("Finalizing.");
276 277
			if (!stepFinalize())	{
277 278
				return false;
278 279
			}
279 280
			this.worked(20);
280 281
		}
281 282
		
282
		//return super._compute(update);
283 283
		return true;
284 284
	}
285 285

  
tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionChartCreator.java (revision 573)
15 15
import org.jfree.ui.RectangleAnchor;
16 16
import org.jfree.ui.TextAnchor;
17 17
import org.txm.chartsengine.core.ChartsEngine;
18
import org.txm.chartsengine.core.results.ChartResult;
18 19
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
19 20
import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
20 21
import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
21 22
import org.txm.chartsengine.jfreechart.core.themes.base.ExtendedNumberAxis;
22
import org.txm.core.results.TXMResult;
23 23
import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
24 24
import org.txm.progression.core.chartsengine.base.Utils;
25 25
import org.txm.progression.core.chartsengine.jfreechart.themes.highcharts.renderers.ProgressionItemSelectionRenderer;
......
38 38

  
39 39

  
40 40
	@Override
41
	public JFreeChart createChart(TXMResult result) {
41
	public JFreeChart createChart(ChartResult result) {
42 42

  
43 43
		
44 44
		Progression progression = (Progression) result;
......
133 133
		// Match the X-axis origin value to the min x corpus (for subcorpus case)
134 134
		chart.getXYPlot().getDomainAxis().setLowerBound(progression.getXminCorpus());
135 135

  
136
		this.updateChart(chart, result);
136
		this.updateChart(result);
137 137
		
138 138
		return chart;
139 139
		
......
141 141

  
142 142

  
143 143
	@Override
144
	public void updateChart(Object chart, TXMResult result) {
144
	public void updateChart(ChartResult result) {
145 145

  
146 146
		Progression progression = (Progression) result;
147 147
		
148
		JFreeChart c = (JFreeChart) chart;
148
		JFreeChart c = (JFreeChart) result.getChart();
149 149
		
150 150
		// removes all existing domain marker
151 151
		c.getXYPlot().clearDomainMarkers();
......
200 200
		
201 201
		c.setTitle(Utils.createProgressionChartTitle(progression, true));
202 202
		
203
		super.updateChart(chart, result);
203
		super.updateChart(result);
204 204
		
205 205
	}
206 206

  
tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/r/RProgressionChartCreator.java (revision 573)
5 5

  
6 6
import org.apache.commons.lang.StringEscapeUtils;
7 7
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
8
import org.txm.chartsengine.core.results.ChartResult;
8 9
import org.txm.chartsengine.r.core.RChartCreator;
9 10
import org.txm.chartsengine.r.core.themes.DefaultTheme;
10
import org.txm.core.results.TXMResult;
11 11
import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
12 12
import org.txm.progression.core.chartsengine.base.Utils;
13 13
import org.txm.progression.core.functions.Progression;
......
26 26

  
27 27

  
28 28
	@Override
29
	public File createChartFile(TXMResult result, File file) {
29
	public File createChartFile(ChartResult result, File file) {
30 30

  
31 31
		try {
32 32
			
tmp/org.txm.progression.core/src/org/txm/progression/core/preferences/ProgressionPreferences.java (revision 573)
21 21
	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(ProgressionPreferences.class).getSymbolicName();
22 22

  
23 23
	public static final String PREFERENCES_PREFIX = "progression_"; //$NON-NLS-1$
24

  
25
	/**
26
	 * Queries.
27
	 */
28
	public static final String QUERIES = PREFERENCES_PREFIX + "queries"; //$NON-NLS-1$
24 29
	
30
	
25 31
	/** The Constant CUMULATIVE. */
26 32
	public static final String CHART_CUMULATIVE = PREFERENCES_PREFIX + "chart_cumulative"; //$NON-NLS-1$
27 33
	
......
34 40
	/** The Constant MONO_STYLE. */
35 41
	public static final String CHART_MONO_STYLE = PREFERENCES_PREFIX + "chart_mono_style"; //$NON-NLS-1$
36 42
	
43
	
44
	
37 45
	/**
38 46
	 * 
39 47
	 */
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java (revision 573)
600 600
	public void updateChart(Object chart, ChartResult result)	{
601 601
		ChartCreator chartCreator = this.getChartCreator(result, result.getChartType());
602 602
		if(chartCreator != null)	{
603
			chartCreator.updateChart(chart, result);
603
			chartCreator.updateChart(result);
604 604
		}
605 605
	}
606 606
	
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartCreator.java (revision 573)
4 4
import java.io.File;
5 5
import java.util.ArrayList;
6 6

  
7
import org.txm.chartsengine.core.results.ChartResult;
7 8
import org.txm.core.results.TXMResult;
8 9
import org.txm.utils.logger.Log;
9 10

  
......
62 63
	 * @param result
63 64
	 * @return
64 65
	 */
65
	public abstract Object createChart(TXMResult result);
66
	public abstract Object createChart(ChartResult result);
66 67
	
67 68
	
68 69
	/**
......
72 73
	 * @param preferencesNode
73 74
	 * @return
74 75
	 */
75
	public File createChartFile(TXMResult result, File file)	{
76
	public File createChartFile(ChartResult result, File file)	{
76 77
		Object chart = this.createChart(result);
77 78
		// Synchronizes the chart with the shared preferences as show title, show legend, rendering colors mode, etc. 
78
		this.updateChart(chart, result);
79
		this.updateChart(result);
79 80
		return this.chartsEngine.createChartFile(chart, file);
80 81
	}
81 82
	
......
86 87
	 * @param params
87 88
	 * @return
88 89
	 */
89
	public File createChartFile(TXMResult result, String fileNamePrefix)	{
90
	public File createChartFile(ChartResult result, String fileNamePrefix)	{
90 91
		return this.createChartFile(result, this.chartsEngine.createTmpFile(fileNamePrefix));
91 92
	}
92 93
	
......
97 98
	 * @param params
98 99
	 * @return
99 100
	 */
100
	public File createChartFile(TXMResult result) {
101
	public File createChartFile(ChartResult result) {
101 102
		return this.createChartFile(result, this.fileNamePrefix);
102 103
	}
103 104

  
......
107 108
	 * Subclasses should override this method to update a chart without recreating one.
108 109
	 * This method is dedicated for example, to hide a title, to change a rendering style, etc.
109 110
	 * This method is called by the SWT charts components provider when just after a chart is created.
110
	 * @param chart
111 111
	 * @param result
112 112
	 * @param preferencesNode
113 113
	 */
114
	public void updateChart(Object chart, TXMResult result)	{
114
	public void updateChart(ChartResult result)	{
115 115
		Log.severe("ChartCreator.updateChart(): not implemented. This method is intended to be overridden in subclasses."); //$NON-NLS-1$
116 116
	}
117 117
	
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java (revision 573)
83 83
	
84 84
	protected boolean renderChart(boolean update) throws Exception {
85 85

  
86
		this.subTask("rendering chart");
86
		this.subTask("Rendering chart.");
87 87

  
88 88
		// FIXME: Debug
89 89
		System.err.println("ChartResult.renderChart(): rendering chart of type " + this.getClass() + "...");
......
111 111
				// FIXME: debug
112 112
				System.err.println("ChartResult.renderChart(): updating chart.");
113 113
				
114
				chartCreator.updateChart(this.chart, this);
114
				chartCreator.updateChart(this);
115 115
			}
116 116
			else	{
117 117
				
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RCAChartCreator.java (revision 573)
10 10
import org.txm.ca.core.messages.CACoreMessages;
11 11
import org.txm.ca.core.preferences.CAPreferences;
12 12
import org.txm.ca.core.statsengine.r.functions.FactoMineRCA;
13
import org.txm.chartsengine.core.results.ChartResult;
13 14
import org.txm.chartsengine.r.core.RChartCreator;
14 15
import org.txm.chartsengine.r.core.RChartsEngine;
15
import org.txm.core.results.TXMResult;
16 16
import org.txm.utils.logger.Log;
17 17

  
18 18
/**
......
117 117
	}
118 118
	
119 119
	@Override
120
	public Object createChart(TXMResult result) {
120
	public Object createChart(ChartResult result) {
121 121
		// TODO Auto-generated method stub
122 122
		return null;
123 123
	}
124 124

  
125 125
	@Override
126
	public File createChartFile(TXMResult result, File file) {
126
	public File createChartFile(ChartResult result, File file) {
127 127

  
128 128
		CA ca = (CA) result;
129 129
		
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RSingularValuesChartCreator.java (revision 573)
6 6
import org.txm.ca.core.functions.Eigenvalues;
7 7
import org.txm.ca.core.messages.CACoreMessages;
8 8
import org.txm.ca.core.statsengine.r.functions.FactoMineRCA;
9
import org.txm.core.results.TXMResult;
9
import org.txm.chartsengine.core.results.ChartResult;
10 10
import org.txm.chartsengine.r.core.RChartCreator;
11 11

  
12 12
/**
......
18 18
public class RSingularValuesChartCreator extends RChartCreator {
19 19

  
20 20
	@Override
21
	public File createChartFile(TXMResult result, File file) {
21
	public File createChartFile(ChartResult result, File file) {
22 22

  
23 23
		CA ca = (CA) ((Eigenvalues) result).getCA();
24 24
		
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCSingularValueChartCreator.java (revision 573)
8 8
import org.txm.ca.core.functions.CA;
9 9
import org.txm.ca.core.functions.Eigenvalues;
10 10
import org.txm.ca.core.messages.CACoreMessages;
11
import org.txm.chartsengine.core.results.ChartResult;
11 12
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
12 13
import org.txm.chartsengine.jfreechart.core.themes.base.ExtendedNumberAxis;
13
import org.txm.core.results.TXMResult;
14 14
import org.txm.statsengine.core.StatException;
15 15
import org.txm.utils.logger.Log;
16 16

  
......
24 24

  
25 25

  
26 26
	@Override
27
	public Object createChart(TXMResult result) {
27
	public Object createChart(ChartResult result) {
28 28
		
29 29
		
30 30
		CA ca = (CA) ((Eigenvalues) result).getCA();
tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCCAChartCreator.java (revision 573)
27 27
import org.txm.ca.core.messages.CACoreMessages;
28 28
import org.txm.ca.core.preferences.CAPreferences;
29 29
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
30
import org.txm.chartsengine.core.results.ChartResult;
30 31
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
31 32
import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
32 33
import org.txm.chartsengine.jfreechart.core.themes.base.BlockRoundBorder;
33 34
import org.txm.core.preferences.TXMPreferences;
34
import org.txm.core.results.TXMResult;
35 35
import org.txm.statsengine.core.StatException;
36 36
import org.txm.utils.logger.Log;
37 37

  
......
44 44
public class JFCCAChartCreator extends JFCChartCreator implements CAChartCreator {
45 45

  
46 46
	@Override
47
	public JFreeChart createChart(TXMResult result) {
47
	public JFreeChart createChart(ChartResult result) {
48 48

  
49 49
		
50 50
		CA ca = (CA) result;
......
82 82
		}
83 83

  
84 84

  
85
		this.updateChart(chart, result);
85
		this.updateChart(result);
86 86
		
87 87
		return chart;		
88 88
		
89 89
	}
90 90

  
91 91
	@Override
92
	public void updateChart(Object chart, TXMResult result) {
92
	public void updateChart(ChartResult result) {
93 93

  
94
		FCAItemSelectionRenderer renderer = (FCAItemSelectionRenderer) ((JFreeChart)chart).getXYPlot().getRenderer(); 
95
   	 	XYPlot plot = ((JFreeChart)chart).getXYPlot();
96 94
		
95
		JFreeChart chart = (JFreeChart)result.getChart();
97 96
		
97
		FCAItemSelectionRenderer renderer = (FCAItemSelectionRenderer) chart.getXYPlot().getRenderer(); 
98
   	 	XYPlot plot = chart.getXYPlot();
99
		
100
		
98 101
		renderer.setSeriesVisible(0, result.getBooleanParameterValue(CAPreferences.SHOW_VARIABLES));
99 102
		renderer.setSeriesVisible(1, result.getBooleanParameterValue(CAPreferences.SHOW_INDIVIDUALS));
100 103
		
101 104
		// Create the limits border
102
		this.createCAFactorialMapChartLimitsBorder((JFreeChart) chart);
105
		this.createCAFactorialMapChartLimitsBorder(chart);
103 106

  
104 107
		this.updateChartCAFactorialMapSetDimensions(chart, (CA) result,
105 108
				result.getIntParameterValue(CAPreferences.FIRST_DIMENSION),
......
108 111

  
109 112

  
110 113
		
111
    	((FCAItemSelectionRenderer)renderer).setBaseLinesVisible(false);
114
    	renderer.setBaseLinesVisible(false);
112 115
    	renderer.setBaseOutlinePaint(Color.decode("#666666"));
113 116
    	
114 117
      	// Items colors (Highcharts color codes)
......
123 126
        ArrayList<Color> palette = new ArrayList<Color>(2);
124 127
        palette.add(blue);
125 128
        palette.add(red);
126
        LegendTitle legendTitle = ((JFreeChart) chart).getLegend(0);
129
        LegendTitle legendTitle = chart.getLegend(0);
127 130
    	if(legendTitle != null)	{
128 131
    		legendTitle.setFrame(new BlockRoundBorder(Color.GRAY));
129 132
        	this.getChartsEngine().getJFCTheme().applyLegendDefaultSettings(legendTitle, false, false, palette);
......
186 189
        
187 190
        
188 191

  
189
		super.updateChart(chart, result);
192
		super.updateChart(result);
190 193

  
191 194
    	
192 195
    	// FIXME
tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/JFCChartCreator.java (revision 573)
9 9
import org.jfree.chart.plot.XYPlot;
10 10
import org.txm.chartsengine.core.ChartCreator;
11 11
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
12
import org.txm.core.preferences.TXMPreferences;
13
import org.txm.core.results.TXMResult;
12
import org.txm.chartsengine.core.results.ChartResult;
14 13

  
15 14

  
16 15

  
......
31 30
	
32 31

  
33 32
	@Override
34
	public void updateChart(Object chart, TXMResult result) {
35
		this.updateChart(chart, result, true);
33
	public void updateChart(ChartResult result) {
34
		this.updateChart(result, true);
36 35
	}
37 36
	
38 37

  
......
43 42
	 * @param preferencesNode
44 43
	 * @param applyTheme
45 44
	 */
46
	public void updateChart(Object chart, TXMResult result, boolean applyTheme) {
45
	public void updateChart(ChartResult result, boolean applyTheme) {
47 46

  
48 47
		// Java object
49
		if(chart instanceof JFreeChart)	{
50
			JFreeChart c = (JFreeChart) chart;
48
		if(result.getChart() instanceof JFreeChart)	{
49
			JFreeChart cchart = (JFreeChart) result.getChart();
51 50
			
52 51
			// freeze rendering
53
			c.setNotify(false);
52
			cchart.setNotify(false);
54 53

  
55 54
			
56
			if(c.getTitle() != null)	{
57
				c.getTitle().setVisible(result.getBooleanParameterValue(ChartsEnginePreferences.SHOW_TITLE));
55
			if(cchart.getTitle() != null)	{
56
				cchart.getTitle().setVisible(result.getBooleanParameterValue(ChartsEnginePreferences.SHOW_TITLE));
58 57
			}
59
			if(c.getLegend() != null)	{
60
				c.getLegend().setVisible(result.getBooleanParameterValue(ChartsEnginePreferences.SHOW_LEGEND));
58
			if(cchart.getLegend() != null)	{
59
				cchart.getLegend().setVisible(result.getBooleanParameterValue(ChartsEnginePreferences.SHOW_LEGEND));
61 60
			}
62 61
			
63 62
			// CategoryPlot
64
			if(c.getPlot() instanceof CategoryPlot)	{
65
				CategoryPlot plot = (CategoryPlot) c.getPlot();
63
			if(cchart.getPlot() instanceof CategoryPlot)	{
64
				CategoryPlot plot = (CategoryPlot) cchart.getPlot();
66 65
				plot.setDomainGridlinesVisible(result.getBooleanParameterValue(ChartsEnginePreferences.SHOW_GRID));
67 66
				plot.setRangeGridlinesVisible(result.getBooleanParameterValue(ChartsEnginePreferences.SHOW_GRID));
68 67
			}
69 68
			// XYPlot
70
			else if(c.getPlot() instanceof XYPlot)	{
71
				XYPlot plot = (XYPlot) c.getPlot();
69
			else if(cchart.getPlot() instanceof XYPlot)	{
70
				XYPlot plot = (XYPlot) cchart.getPlot();
72 71
				plot.setRangeGridlinesVisible(result.getBooleanParameterValue(ChartsEnginePreferences.SHOW_GRID));
73 72
				plot.setDomainGridlinesVisible(result.getBooleanParameterValue(ChartsEnginePreferences.SHOW_GRID));
74 73
			}
75 74

  
76 75
			if(applyTheme)	{
77
				this.getChartsEngine().getJFCTheme().applyThemeToChart(c, result, true);
76
				this.getChartsEngine().getJFCTheme().applyThemeToChart(cchart, result, true);
78 77
			}
79 78

  
80
			c.setNotify(true);
79
			cchart.setNotify(true);
81 80
		}
82 81
		// File
83
		else if(chart instanceof File)	{
82
		else if(result.getChart() instanceof File)	{
84 83
			// creates a new chart but using the same file
85
			this.createChartFile(result, (File)chart);
84
			this.createChartFile(result, (File)result.getChart());
86 85
				
87 86
			// FIXME: using new file
88 87
			//this.createChartFile(resultData, preferencesNode);
tmp/org.txm.chartsengine.r.core/src/org/txm/chartsengine/r/core/RChartCreator.java (revision 573)
5 5
import java.util.ArrayList;
6 6

  
7 7
import org.txm.chartsengine.core.ChartCreator;
8
import org.txm.chartsengine.core.results.ChartResult;
8 9
import org.txm.core.results.TXMResult;
9 10
import org.txm.utils.logger.Log;
10 11

  
......
19 20

  
20 21
	
21 22
	
22
	/**
23
	 * 
24
	 */
25
	public RChartCreator() {
26
	}
27

  
28 23
	@Override
29
	public Object createChart(TXMResult result) {
24
	public Object createChart(ChartResult result) {
30 25
		return this.createChartFile(result);
31 26
	}
32 27

  
33 28
	
34 29
	@Override
35
	public void updateChart(Object chart, TXMResult result) {
30
	public void updateChart(ChartResult result) {
36 31
	
37 32
		// creates a new chart but using the same file
38
		this.createChartFile(result, (File)chart);
33
		this.createChartFile(result, (File)result.getChart());
39 34
			
40 35
		// FIXME: using new file
41 36
		//this.createChartFile(resultData, preferencesNode);
tmp/org.txm.cah.core/src/org/txm/cah/core/chartsengine/r/RAHCChartCreator.java (revision 573)
4 4

  
5 5
import org.txm.cah.core.functions.AHC;
6 6
import org.txm.cah.core.preferences.AHCPreferences;
7
import org.txm.core.preferences.TXMPreferences;
8
import org.txm.core.results.TXMResult;
7
import org.txm.chartsengine.core.results.ChartResult;
9 8
import org.txm.chartsengine.r.core.RChartCreator;
10 9

  
11 10
/**
......
19 18

  
20 19

  
21 20
	@Override
22
	public File createChartFile(TXMResult result, File file) {
21
	public File createChartFile(ChartResult result, File file) {
23 22

  
24 23
		AHC cah = (AHC) result;
25 24
		
tmp/org.txm.cah.core/src/org/txm/cah/core/chartsengine/jfreechart/JFCAHCChartCreator.java (revision 573)
2 2

  
3 3
import org.jfree.chart.JFreeChart;
4 4
import org.txm.cah.core.functions.AHC;
5
import org.txm.core.results.TXMResult;
5
import org.txm.chartsengine.core.results.ChartResult;
6 6
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
7 7

  
8 8
/**
......
15 15
 */
16 16
public class JFCAHCChartCreator extends JFCChartCreator {
17 17

  
18
	public JFCAHCChartCreator() {
19
		// TODO Auto-generated constructor stub
20
	}
21 18

  
22 19
	@Override
23
	public JFreeChart createChart(TXMResult result) {
20
	public JFreeChart createChart(ChartResult result) {
24 21

  
25
		System.err.println("JFCCAHChartCreator.createChart(): not yet implemented.");
22
		System.err.println("JFCAHCChartCreator.createChart(): not yet implemented.");
26 23
		
27 24
		final AHC cah = (AHC) result;
28 25
		
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsPieChartCreator.java (revision 573)
3 3

  
4 4
import org.jfree.chart.JFreeChart;
5 5
import org.jfree.data.general.DefaultPieDataset;
6
import org.txm.chartsengine.core.results.ChartResult;
6 7
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
7
import org.txm.core.results.TXMResult;
8 8
import org.txm.partition.core.chartsengine.base.Utils;
9 9
import org.txm.partition.core.functions.PartitionDimensions;
10 10
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
......
20 20

  
21 21

  
22 22
	@Override
23
	public Object createChart(TXMResult result) {
23
	public Object createChart(ChartResult result) {
24 24
		
25 25
		PartitionDimensions partitionDimensions = (PartitionDimensions) result;
26 26
		
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsBarChartCreator.java (revision 573)
5 5

  
6 6
import org.jfree.chart.JFreeChart;
7 7
import org.jfree.chart.axis.NumberAxis;
8
import org.jfree.chart.axis.SymbolAxis;
9 8
import org.jfree.chart.title.TextTitle;
10 9
import org.jfree.chart.title.Title;
11 10
import org.jfree.data.general.DatasetUtilities;
12 11
import org.jfree.data.xy.XYSeries;
13 12
import org.jfree.data.xy.XYSeriesCollection;
14 13
import org.txm.chartsengine.core.ChartsEngine;
14
import org.txm.chartsengine.core.results.ChartResult;
15 15
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
16 16
import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
17 17
import org.txm.chartsengine.jfreechart.core.themes.base.ExtendedNumberAxis;
18 18
import org.txm.chartsengine.jfreechart.core.themes.base.SymbolAxisBetweenTicks;
19
import org.txm.core.results.TXMResult;
20 19
import org.txm.partition.core.chartsengine.base.Utils;
21 20
import org.txm.partition.core.functions.PartitionDimensions;
22 21
import org.txm.partition.core.messages.PartitionCoreMessages;
......
32 31

  
33 32

  
34 33
	@Override
35
	public JFreeChart createChart(TXMResult result) {
34
	public JFreeChart createChart(ChartResult result) {
36 35

  
37 36
		JFreeChart chart = null;
38 37

  
......
51 50
	}
52 51

  
53 52
	@Override
54
	public void updateChart(Object chart, TXMResult result) {
53
	public void updateChart(ChartResult result) {
55 54
		
56 55
		PartitionDimensions partitionDimensions = (PartitionDimensions) result;
57
		JFreeChart jfcChart = (JFreeChart) chart;
56
		JFreeChart chart = (JFreeChart) result.getChart();
58 57
		
59 58
		// freeze rendering while computing
60
		jfcChart.setNotify(false);
59
		chart.setNotify(false);
61 60
		
62 61
		
63 62
		// parameters
......
65 64
		boolean displayPartsCountInTitle = partitionDimensions.isDisplayingPartCountInTitle();
66 65
		
67 66
		// Fill the data set
68
		XYSeriesCollection dataset = (XYSeriesCollection) jfcChart.getXYPlot().getDataset();
67
		XYSeriesCollection dataset = (XYSeriesCollection) chart.getXYPlot().getDataset();
69 68
		dataset.removeAllSeries();
70 69
		
71 70
		XYSeries series = new XYSeries(PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_CATEGORY);
......
88 87
			e.printStackTrace();
89 88
		}
90 89

  
91
		jfcChart.getXYPlot().setDomainAxis(new SymbolAxisBetweenTicks(jfcChart.getXYPlot().getDomainAxis().getLabel(), xAxisSymbols));
90
		chart.getXYPlot().setDomainAxis(new SymbolAxisBetweenTicks(chart.getXYPlot().getDomainAxis().getLabel(), xAxisSymbols));
92 91
		
93 92
		// Create chart title
94
		jfcChart.setTitle(Utils.createPartitionDimensionsChartTitle(partitionDimensions, sortPartsBySize, displayPartsCountInTitle));
93
		chart.setTitle(Utils.createPartitionDimensionsChartTitle(partitionDimensions, sortPartsBySize, displayPartsCountInTitle));
95 94
		
96 95
		
97 96
		
98
		super.updateChart(chart, result);
97
		super.updateChart(result);
99 98

  
100 99
		
101 100
		// Subtitle
102
		if(jfcChart.getSubtitleCount() > 0)	{
103
			jfcChart.removeSubtitle(jfcChart.getSubtitle(0));	
101
		if(chart.getSubtitleCount() > 0)	{
102
			chart.removeSubtitle(chart.getSubtitle(0));	
104 103
		}
105
		jfcChart.addSubtitle(new TextTitle(Utils.createPartitionDimensionsChartSubtitle(partitionDimensions, sortPartsBySize, displayPartsCountInTitle), this.getChartsEngine().getJFCTheme().getSmallFont(),
104
		chart.addSubtitle(new TextTitle(Utils.createPartitionDimensionsChartSubtitle(partitionDimensions, sortPartsBySize, displayPartsCountInTitle), this.getChartsEngine().getJFCTheme().getSmallFont(),
106 105
				((Color)this.getChartsEngine().getJFCTheme().getAxisLabelPaint()), Title.DEFAULT_POSITION,
107 106
                Title.DEFAULT_HORIZONTAL_ALIGNMENT,
108 107
                Title.DEFAULT_VERTICAL_ALIGNMENT, Title.DEFAULT_PADDING));
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsBarChartCreator.java (revision 573)
4 4
import java.util.List;
5 5

  
6 6
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
7
import org.txm.chartsengine.core.results.ChartResult;
7 8
import org.txm.chartsengine.r.core.RChartCreator;
8 9
import org.txm.chartsengine.r.core.RChartsEngine;
9
import org.txm.core.results.TXMResult;
10 10
import org.txm.partition.core.chartsengine.base.Utils;
11 11
import org.txm.partition.core.functions.PartitionDimensions;
12 12
import org.txm.partition.core.messages.PartitionCoreMessages;
......
22 22

  
23 23
	
24 24
	@Override
25
	public File createChartFile(TXMResult result, File file) {
25
	public File createChartFile(ChartResult result, File file) {
26 26

  
27 27
		try {
28 28
			
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsPieChartCreator.java (revision 573)
4 4
import java.util.List;
5 5

  
6 6
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
7
import org.txm.chartsengine.core.results.ChartResult;
7 8
import org.txm.chartsengine.r.core.RChartCreator;
8 9
import org.txm.chartsengine.r.core.RChartsEngine;
9
import org.txm.core.results.TXMResult;
10 10
import org.txm.partition.core.chartsengine.base.Utils;
11 11
import org.txm.partition.core.functions.PartitionDimensions;
12 12
import org.txm.partition.core.messages.PartitionCoreMessages;
......
22 22

  
23 23
	
24 24
	@Override
25
	public File createChartFile(TXMResult result, File file) {
25
	public File createChartFile(ChartResult result, File file) {
26 26

  
27 27
		try {
28 28
			
tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/chartsengine/jfreechart/JFCWordCloudChartCreator.java (revision 573)
2 2

  
3 3
import org.jfree.chart.JFreeChart;
4 4
import org.jfree.data.xy.XYSeriesCollection;
5
import org.txm.core.results.TXMResult;
5
import org.txm.chartsengine.core.results.ChartResult;
6 6
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
7 7
import org.txm.wordcloud.core.functions.WordCloud;
8 8

  
......
13 13
	}
14 14

  
15 15
	@Override
16
	public JFreeChart createChart(TXMResult result) {
16
	public JFreeChart createChart(ChartResult result) {
17 17

  
18 18
		// TODO Auto-generated method stub
19 19
		System.err.println("JFCWordCloudChartCreator.createChart(): Not yet implemented");
tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/chartsengine/r/RWordCloudChartCreator.java (revision 573)
2 2

  
3 3
import java.io.File;
4 4

  
5
import org.txm.chartsengine.core.results.ChartResult;
5 6
import org.txm.chartsengine.r.core.RChartCreator;
6 7
import org.txm.chartsengine.r.core.RChartsEngine;
7
import org.txm.core.results.TXMResult;
8 8
import org.txm.statsengine.core.StatException;
9 9
import org.txm.statsengine.r.core.RWorkspace;
10 10
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
......
15 15

  
16 16

  
17 17
	@Override
18
	public File createChartFile(TXMResult result, File file) {
18
	public File createChartFile(ChartResult result, File file) {
19 19
		
20 20
		try {
21 21
			WordCloud wordCloud = (WordCloud) result;
tmp/org.txm.textsbalance.core/src/org/txm/textsbalance/core/chartsengine/jfreechart/JFCTextsBalanceSpiderChartCreator.java (revision 573)
9 9
import org.jfree.chart.plot.SpiderWebPlot;
10 10
import org.jfree.data.category.CategoryDataset;
11 11
import org.jfree.data.category.DefaultCategoryDataset;
12
import org.txm.core.results.TXMResult;
12
import org.txm.chartsengine.core.results.ChartResult;
13 13
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
14 14
import org.txm.textsbalance.core.functions.TextsBalance;
15 15

  
......
17 17

  
18 18

  
19 19
	@Override
20
	public JFreeChart createChart(TXMResult result) {
20
	public JFreeChart createChart(ChartResult result) {
21 21

  
22 22
		TextsBalance textsBalance = (TextsBalance) result;
23 23
		JFreeChart chart = null;
......
44 44

  
45 45
		chart = new JFreeChart(plot);
46 46
		
47
		this.updateChart(chart, result);
47
		this.updateChart(result);
48 48
		
49 49
		return chart;
50 50
	}
51 51

  
52 52

  
53 53
	@Override
54
	public void updateChart(Object chart, TXMResult result) {
54
	public void updateChart(ChartResult result) {
55 55
		
56 56
		TextsBalance textsBalance = (TextsBalance) result;
57 57
		
58
		JFreeChart c = (JFreeChart) chart;
58
		JFreeChart chart = (JFreeChart) result.getChart();
59 59

  
60 60
		// updating data set
61 61
		HashMap<Integer, Comparable[]> data = textsBalance.getDataset();
62
		DefaultCategoryDataset dataset = (DefaultCategoryDataset) ((SpiderWebPlot)c.getPlot()).getDataset();
62
		DefaultCategoryDataset dataset = (DefaultCategoryDataset) ((SpiderWebPlot)chart.getPlot()).getDataset();
63 63
		dataset.clear();
64 64
		
65 65
		Set<Integer> keys = data.keySet();
......
70 70
		   dataset.addValue(key, value[0], value[1]);
71 71
		}
72 72
		
73
		c.setTitle("metadata = " + textsBalance.getPropertyName() + ", N = " +  textsBalance.getValues().size() + ", fmin = " + textsBalance.getFMin() + ", fmax = " + textsBalance.getFMax() + ", group by texts = " + textsBalance.groupingByTexts());
73
		chart.setTitle("metadata = " + textsBalance.getPropertyName() + ", N = " +  textsBalance.getValues().size() + ", fmin = " + textsBalance.getFMin() + ", fmax = " + textsBalance.getFMax() + ", group by texts = " + textsBalance.groupingByTexts());
74 74
		
75
		super.updateChart(chart, result);
75
		super.updateChart(result);
76 76
	}
77 77
	
78 78
	@Override
tmp/org.txm.textsbalance.core/src/org/txm/textsbalance/core/chartsengine/r/RBalanceSpiderChartCreator.java (revision 573)
2 2

  
3 3
import java.io.File;
4 4

  
5
import org.txm.core.results.TXMResult;
5
import org.txm.chartsengine.core.results.ChartResult;
6 6
import org.txm.chartsengine.r.core.RChartCreator;
7 7
import org.txm.chartsengine.r.core.RChartsEngine;
8 8
import org.txm.textsbalance.core.functions.TextsBalance;
9 9

  
10
/**
11
 * 
12
 * @author sjacquot
13
 *
14
 */
10 15
public class RBalanceSpiderChartCreator extends RChartCreator {
11 16

  
12
	public RBalanceSpiderChartCreator() {
13
		// TODO Auto-generated constructor stub
14
	}
15 17

  
16

  
17 18
	@Override
18
	public File createChartFile(TXMResult result, File file) {
19
	public File createChartFile(ChartResult result, File file) {
19 20
		
20 21
//		try {
21 22
	
tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/jfreechart/JFCSpecificitiesBarChartCreator.java (revision 573)
12 12
import org.jfree.ui.RectangleAnchor;
13 13
import org.jfree.ui.TextAnchor;
14 14
import org.txm.chartsengine.core.ChartsEngine;
15
import org.txm.chartsengine.core.results.ChartResult;
15 16
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
16 17
import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
17 18
import org.txm.chartsengine.jfreechart.core.themes.base.ExtendedNumberAxis;
18 19
import org.txm.chartsengine.jfreechart.core.themes.base.SymbolAxisBetweenTicks;
19
import org.txm.core.results.TXMResult;
20
import org.txm.specificities.core.functions.Specificities;
21 20
import org.txm.specificities.core.functions.SpecificitiesSelection;
22 21
import org.txm.specificities.core.messages.SpecificitiesCoreMessages;
23
import org.txm.specificities.core.preferences.SpecificitiesPreferences;
24 22

  
25 23
/**
26 24
 * Creates a bar chart from the specified <code>SpecificitiesSelection</code> result.
......
30 28
public class JFCSpecificitiesBarChartCreator extends JFCChartCreator {
31 29

  
32 30
	@Override
33
	public JFreeChart createChart(TXMResult result) {
31
	public JFreeChart createChart(ChartResult result) {
34 32

  
35 33
		SpecificitiesSelection specificitiesSelection = (SpecificitiesSelection) result;
36 34

  
......
64 62
	}
65 63

  
66 64
	@Override
67
	public void updateChart(Object chart, TXMResult result) {
65
	public void updateChart(ChartResult result) {
68 66
		
69 67
		SpecificitiesSelection specificitiesSelection = (SpecificitiesSelection) result;
70
		JFreeChart jfcChart = (JFreeChart) chart;
68
		JFreeChart chart = (JFreeChart) result.getChart();
71 69
		
72 70
		float banality = specificitiesSelection.getBanality();
73 71

  
74 72
		
75 73
		// freeze rendering
76
		jfcChart.setNotify(false);
74
		chart.setNotify(false);
77 75

  
78 76
		
79 77
		// Fill the data set
80
		XYSeriesCollection dataset = (XYSeriesCollection) jfcChart.getXYPlot().getDataset();
78
		XYSeriesCollection dataset = (XYSeriesCollection) chart.getXYPlot().getDataset();
81 79
		dataset.removeAllSeries();
82 80
		String[] xAxisSymbols;
83 81

  
......
114 112
		}
115 113
		
116 114
		// removes all existing range marker
117
		jfcChart.getXYPlot().clearRangeMarkers();
115
		chart.getXYPlot().clearRangeMarkers();
118 116
		
119 117
        // Add positive banality marker
120 118
        Marker marker = new ValueMarker(banality);
......
122 120
        marker.setLabel(SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.Charts_BANALITY_MARKER_LABEL, banality));
123 121
        marker.setLabelAnchor(RectangleAnchor.TOP_RIGHT);
124 122
        marker.setLabelTextAnchor(TextAnchor.BOTTOM_RIGHT);
125
        jfcChart.getXYPlot().addRangeMarker(marker);
123
        chart.getXYPlot().addRangeMarker(marker);
126 124

  
127 125

  
128 126
        // Add negative banality marker
......
131 129
        marker.setLabel(SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.Charts_BANALITY_MARKER_LABEL, -banality));
132 130
        marker.setLabelAnchor(RectangleAnchor.TOP_RIGHT);
133 131
        marker.setLabelTextAnchor(TextAnchor.BOTTOM_RIGHT);
134
        jfcChart.getXYPlot().addRangeMarker(marker);
132
        chart.getXYPlot().addRangeMarker(marker);
135 133

  
136 134
		
137 135
		
138 136
        // Custom range axis for ticks drawing options
139
        double minimumValue = DatasetUtilities.findMinimumRangeValue(jfcChart.getXYPlot().getDataset()).doubleValue();
140
        double maximumValue = DatasetUtilities.findMaximumRangeValue(jfcChart.getXYPlot().getDataset()).doubleValue();
137
        double minimumValue = DatasetUtilities.findMinimumRangeValue(chart.getXYPlot().getDataset()).doubleValue();
138
        double maximumValue = DatasetUtilities.findMaximumRangeValue(chart.getXYPlot().getDataset()).doubleValue();
141 139
        // Adjust ticks values according to data set contains only positives values or only negatives values
142 140
        if(minimumValue > 0)	{
143 141
        	minimumValue = 0;
......
146 144
        	maximumValue = specificitiesSelection.getBanality();
147 145
        }
148 146
        // Custom range axis to cut the values to minimum and maximum values
149
        jfcChart.getXYPlot().setRangeAxis(new ExtendedNumberAxis((NumberAxis) jfcChart.getXYPlot().getRangeAxis(), true, true, minimumValue, maximumValue));
147
        chart.getXYPlot().setRangeAxis(new ExtendedNumberAxis((NumberAxis) chart.getXYPlot().getRangeAxis(), true, true, minimumValue, maximumValue));
150 148
		
151
        jfcChart.getXYPlot().setDomainAxis(new SymbolAxisBetweenTicks(SpecificitiesCoreMessages.Charts_X_AXIS_LABEL, xAxisSymbols));
149
        chart.getXYPlot().setDomainAxis(new SymbolAxisBetweenTicks(SpecificitiesCoreMessages.Charts_X_AXIS_LABEL, xAxisSymbols));
152 150

  
153 151
        
154
		super.updateChart(chart, result);
152
		super.updateChart(result);
155 153
		
156 154
	}
157 155
	
tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/r/RSpecificitiesBarChartCreator.java (revision 573)
3 3
import java.io.File;
4 4

  
5 5
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
6
import org.txm.chartsengine.core.results.ChartResult;
6 7
import org.txm.chartsengine.r.core.RChartCreator;
7
import org.txm.core.results.TXMResult;
8 8
import org.txm.specificities.core.functions.SpecificitiesSelection;
9 9
import org.txm.specificities.core.messages.SpecificitiesCoreMessages;
10 10
import org.txm.statsengine.core.data.Matrix;
......
24 24

  
25 25
	
26 26
	@Override
27
	public File createChartFile(TXMResult result, File file) {
27
	public File createChartFile(ChartResult result, File file) {
28 28

  
29 29
		try {
30 30
			
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 573)
15 15

  
16 16
import org.apache.commons.lang.StringUtils;
17 17
import org.eclipse.core.runtime.IProgressMonitor;
18
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
19 18
import org.osgi.framework.FrameworkUtil;
20 19
import org.osgi.service.prefs.BackingStoreException;
21 20
import org.txm.core.preferences.TXMPreferences;
......
158 157
	protected void updateLastComputingParameters() throws Exception {
159 158
		Field[] fields = this.getClass().getDeclaredFields();
160 159
		for (Field f : fields) {
161
			String name = f.getName();
162 160
			Parameter parameter = f.getAnnotation(Parameter.class);
163 161
			if (parameter == null || parameter.type() != Parameter.COMPUTING) {
164 162
				continue;
165 163
			}
164
			
165
			String name;
166
			if(!"".equals(parameter.key()))	{
167
				name = parameter.key();
168
			}
169
			else	{
170
				name = f.getName();
171
			}
172
			
166 173
			f.setAccessible(true);
167
			lastComputingParameters.put(name, f.get(this));
174
			this.lastComputingParameters.put(name, f.get(this));
168 175
		}
169 176
	}
170 177

  
171 178
	/**
172
	 * Gets a parameter used for last computing.
179
	 * Gets a current parameter specified by its annotation "key" attribute.
173 180
	 * @param key
174 181
	 * @return
175 182
	 */
176
	protected Object getLastParameter(String key) {
183
	protected Object getParameter(String key) {
177 184
		Field[] fields = this.getClass().getDeclaredFields();
178 185
		for (Field f : fields) {
179 186
			Parameter parameter = f.getAnnotation(Parameter.class);
......
202 209
			return false;
203 210
		}
204 211
		Object o = lastComputingParameters.get(key);
205
		Object newValue = getLastParameter(key);
212
		Object newValue = getParameter(key);
206 213
		if (o == null && newValue != null) {
207 214
			return true;
208 215
		}
209 216
		else {
210
			return o.equals(newValue);
217
			return !o.equals(newValue);
211 218
		}
212 219
	}
213 220

  
......
245 252

  
246 253
		Field[] fields = clazz.getDeclaredFields();
247 254
		for (Field f : fields) {
248
			String name = f.getName();
249 255
			Parameter parameter = f.getAnnotation(Parameter.class);
250 256
			if (parameter == null || parameter.type() != Parameter.COMPUTING) {
251 257
				continue;
252 258
			}
259
			
260
			String name;
261
			if(!"".equals(parameter.key()))	{
262
				name = parameter.key();
263
			}
264
			else	{
265
				name = f.getName();
266
			}
267

  
268
			
253 269
			f.setAccessible(true); // not to set accessible to test the field values
254
			Object previousValue = lastComputingParameters.get(name);
270
			Object previousValue = this.lastComputingParameters.get(name);
255 271
			Object newValue = f.get(this);
256 272
			updateDirty(previousValue, newValue);
257
			if (dirty) {
258
				return dirty; // no need to go further
273
			if (this.dirty) {
274
				return this.dirty; // no need to go further
259 275
			}
260 276
		}
261
		return dirty;
277
		return this.dirty;
262 278
	}
263 279

  
264 280

  
......
269 285
	 * @return
270 286
	 */
271 287
	public boolean isDirty() {
272
		return dirty;
288
		return this.dirty;
273 289
	}
274 290

  
275 291
	/**
......
1179 1195
			monitor.worked(amount);
1180 1196
			monitor.subTask(message);
1181 1197
		}
1198
		Log.info(message);
1182 1199
	}
1183 1200

  
1184 1201
	@Override
......
1186 1203
		if (monitor != null) {
1187 1204
			monitor.beginTask(name, totalWork);
1188 1205
		}
1206
		Log.info(name);
1189 1207
	}
1190 1208

  
1191 1209
	@Override
......
1207 1225
		if (monitor != null) {
1208 1226
			monitor.setCanceled(value);
1209 1227
		}
1228
		Log.info("Canceling command.");
1210 1229
	}
1211 1230

  
1212 1231
	@Override
......
1214 1233
		if (monitor != null) {
1215 1234
			monitor.setTaskName(name);
1216 1235
		}
1236
		Log.info(name);
1217 1237
	}
1218 1238

  
1219 1239
	@Override
......
1221 1241
		if (monitor != null) {
1222 1242
			monitor.subTask(name);
1223 1243
		}
1244
		Log.info(name);
1224 1245
	}
1225 1246

  
1226 1247
}
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditorPart.java (revision 573)
206 206
	public void updateEditorFromResult(boolean update) {
207 207
		
208 208
		// loading chart
209
		this.getResultData().subTask("loading chart");
209
		this.getResultData().subTask("Loading chart.");
210 210
		this.loadChart();
211 211
		
212 212
		// if editor wasn't exist:

Also available in: Unified diff