Révision 3714

TXM/trunk/bundles/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 3714)
2372 2372

  
2373 2373
				Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": starting parent (" + this.parent.getClass().getSimpleName() + ") computing process...");
2374 2374

  
2375
				if (!this.parent.compute(mainSubMonitor.split(1).setWorkRemaining(100), deepComputing)) {
2375
				if (!this.parent.compute(mainSubMonitor.split(1).setWorkRemaining(100), false)) {
2376 2376
					Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": failed to compute parent result.");
2377 2377
					this.computing = false;
2378 2378
					return false;
......
2482 2482
				}
2483 2483
			}
2484 2484

  
2485

  
2486 2485
			// Children computing
2487 2486
			if ((!skipComputing
2488 2487
					|| this.altered) // FIXME: SJ: fix for computing LexicalTable children even if the LT is not dirty but only altered, need to define if it's a temporary fix or not
......
2501 2500
				for (int i = 0; i < this.children.size(); i++) {
2502 2501

  
2503 2502
					TXMResult child = this.children.get(i);
2504
					child.setDirty(); // set the children as dirty since the result has changed
2503
					child.setDirty(); // set the children as dirty since the result has changed -> may be computed now or later
2505 2504

  
2506 2505
					// lazy loading test
2507 2506
					// only compute the child if it has already been computed one time ("loaded" one time)
......
2517 2516
		}
2518 2517
		// FIXME: SJ: in case of ThreadDeath we could for example call a method as Engine.interrupt(TXMResult)
2519 2518
		// so the engine can do some clean up, e.g. R destroying some objects, etc.
2520
		// But we also have a TXMResult.clean() method that we could use
2519
		// But we also have a TXMResult.cleanAfterComputeFailure() method that we could use
2521 2520
		catch (ThreadDeath | InterruptedException e) {
2522 2521

  
2523 2522
			// set result and its children as canceled

Formats disponibles : Unified diff