Révision 2159

tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEnginesManager.java (revision 2159)
10 10
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
11 11
import org.txm.core.engines.EngineType;
12 12
import org.txm.core.engines.EnginesManager;
13
import org.txm.utils.logger.Log;
13 14

  
15
import cern.colt.Arrays;
16

  
14 17
/**
15 18
 * Charts engines manager.
16 19
 * 
......
33 36
		// and directly manage that in the Manager
34 37
		ChartsEngine.chartsEngines = new ArrayList<ChartsEngine>();
35 38
//		ChartsEngine.currentChartsEngineIndex = 0;
36
//
37 39

  
40

  
38 41
		for (ChartsEngine engine : this.values()) {
39 42
			ChartsEngine.chartsEngines.add(engine);
40 43
		}
......
42 45
		// add the engines sorted by order defined in preferences
43 46
		this.sortEngines();
44 47
		
45
		
46
//		String[] orderedEnginesNames = ((ChartsEnginePreferences) ChartsEnginePreferences.getInstance()).getEnginesOrder();
47
//		ChartsEngine[] engines = new ChartsEngine[this.size()];
48
//		
49
//		for (ChartsEngine engine : this.values()) {
50
//			//ChartsEngine.chartsEngines.add(engine);
51
//			engines[ArrayUtils.indexOf(orderedEnginesNames, engine.getName())] = engine;
52
//			
53
//		}
54
//		for (int i = 0; i < engines.length; i++) {
55
//			ChartsEngine.chartsEngines.add(engines[i]);	
56
//		}
57
		
58
		
48
			
59 49
		//ChartsEngine.setCurrrentChartsEngine(this.getEngine(ChartsEnginePreferences.getInstance().getString(ChartsEnginePreferences.CURRENT_NAME)));
60 50
		
61 51
		this.setCurrentEngine(ChartsEnginePreferences.getInstance().getString(ChartsEnginePreferences.CURRENT_NAME));
62 52

  
63

  
64 53
		
65 54
		//TXMPreferences.alternativeNodesQualifiers.add(ChartsEnginePreferences.getInstance().getPreferencesNodeQualifier());
66 55

  
......
82 71
			
83 72
			for (ChartsEngine engine : this.values()) {
84 73
				//ChartsEngine.chartsEngines.add(engine);
85
				engines[ArrayUtils.indexOf(orderedEnginesNames, engine.getName())] = engine;
86
				
74
				int idx = ArrayUtils.indexOf(orderedEnginesNames, engine.getName());
75
				if (idx >= 0) {
76
					engines[idx] = engine;
77
				} else {
78
					Log.warning("Chart engine='"+engine.getName()+"' not found in engines ordered list: "+Arrays.toString(orderedEnginesNames));
79
				}
87 80
			}
88 81
			for (int i = 0; i < engines.length; i++) {
89 82
				ChartsEngine.chartsEngines.add(engines[i]);	
......
93 86
		else	{
94 87
			ChartsEnginePreferences.getInstance().put(ChartsEnginePreferences.CHARTS_ENGINES_ORDER, this.createEnginesOrder());
95 88
		}
96
		
97 89
	}
98 90
	
99 91
	
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java (revision 2159)
15 15
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
16 16
import org.txm.chartsengine.core.results.ChartResult;
17 17
import org.txm.core.engines.Engine;
18
import org.txm.core.engines.EngineType;
19 18
import org.txm.core.preferences.TXMPreferences;
20 19
import org.txm.core.results.TXMResult;
21 20
import org.txm.utils.logger.Log;
......
59 58

  
60 59
	/**
61 60
	 * Installed charts engines.
61
	 * TODO remove this static member and use the ChartsEnginesManager 
62 62
	 */
63 63
	protected static ArrayList<ChartsEngine> chartsEngines;
64 64
	

Formats disponibles : Unified diff