Revision 570

tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/functions/WordCloud.java (revision 570)
4 4
import java.util.List;
5 5

  
6 6
import org.txm.chartsengine.core.results.ChartResult;
7
import org.txm.chartsengine.core.results.IChartResult;
8 7
import org.txm.core.results.TXMParameters;
9 8
import org.txm.index.core.functions.Index;
10 9
import org.txm.index.core.functions.Line;
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java (revision 570)
12 12
import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
13 13
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
14 14
import org.txm.chartsengine.core.results.ChartResult;
15
import org.txm.chartsengine.core.results.IChartResult;
16 15
import org.txm.core.preferences.TBXPreferences;
17 16
import org.txm.core.preferences.TXMPreferences;
18
import org.txm.core.results.TXMResult;
19 17
import org.txm.utils.logger.Log;
20 18

  
21 19

  
......
422 420
	 * @return
423 421
	 */
424 422
	//FIXME: check that modification works well
425
	public File createChartFile(IChartResult result, File file, String outputFormat)	{
423
	public File createChartFile(ChartResult result, File file, String outputFormat)	{
426 424
		// FIXME : bad ? Switch the current charts engine output format, export the chart, and then roll back the output format
427 425
		String oldOutputFormat = this.outputFormat;
428 426
		this.setOutputFormat(outputFormat);
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/IChartResult.java (revision 570)
1
package org.txm.chartsengine.core.results;
2

  
3

  
4
/**
5
 * 
6
 * Interface to define if a TXM result is a chart result.
7
 * @author sjacquot
8
 *
9
 */
10
public interface IChartResult {
11

  
12

  
13
}
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java (revision 570)
18 18
 * @author sjacquot
19 19
 *
20 20
 */
21
public abstract class ChartResult extends TXMResult implements IChartResult {
21
public abstract class ChartResult extends TXMResult {
22 22

  
23 23
	/**
24 24
	 * The chart object.
......
65 65
		this.needsToClearItemsSelection = false;
66 66
	}
67 67
	
68
	
69
	public ChartResult() {
70
		this(null);
71
	}
72
	
73

  
74 68
	@Override
75 69
	public boolean compute(boolean update, IProgressMonitor monitor) throws Exception {
76 70

  
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 570)
986 986
		this.updateLastComputingParameters(); // store last used parameters
987 987

  
988 988
		if (!this.saveParameters()) {
989
			System.out.println("Warning: " + this.getName() + " parameters are not saved.");
989
			System.out.println("Warning: failed to save parameters for " + this.getName() + ".");
990 990
		}
991 991

  
992 992
		this.dirty = false; // the computing was successful, the result is no more dirty
tmp/org.txm.chartsengine.rcp/plugin.xml (revision 570)
175 175
                  ifEmpty="false"
176 176
                  operator="and">
177 177
               <instanceof
178
                     value="org.txm.chartsengine.core.results.IChartResult">
178
                     value="org.txm.chartsengine.core.results.ChartResult">
179 179
               </instanceof>
180 180
            </iterate>
181 181
         </with>
tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 570)
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;
46 45
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
47 46
import org.txm.searchengine.cqp.corpus.Corpus;
48 47
import org.txm.searchengine.cqp.corpus.CorpusManager;
......
132 131
	 * @param corpus
133 132
	 */
134 133
	public Progression(Corpus corpus)	{
135
		super();
134
		super(corpus);
136 135
		this.corpus = corpus;
137 136
	}
138 137
	
......
270 269
			if (!stepFinalize())	{
271 270
				return false;
272 271
			}
273
			this.corpus.addChild(this);
274 272
			this.worked(20);
275 273
		}
276 274
		
......
343 341
				
344 342
				// FIXME: long process test for Thread user canceling
345 343
//				System.err.println("Progression.stepQueries(): fixme: simulating a long process for canceling tests purpose.");
346
//				for(long j = 0; j < 10000000L; j++)	{
344
//				for(long j = 0; j < 50000000L; j++)	{
347 345
//					;
348 346
//				}
349 347

  
......
710 708

  
711 709
	@Override
712 710
	public String getSimpleName() {
713
		String output  = this.queries.toString();
714
		if (this.propertyRegex != null) {
715
			output += " " + this.propertyRegex;
711
		try {
712
			String output  = this.queries.toString();
713
			if (this.propertyRegex != null) {
714
				output += " " + this.propertyRegex;
715
			}
716
			return output;
716 717
		}
717
		return output;
718
		catch (Exception e) {
719
		}
720
		return "*";
718 721
	}
719 722

  
720 723

  

Also available in: Unified diff