Révision 1144

tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1144)
1020 1020
	 * @throws Exception
1021 1021
	 */
1022 1022
	public boolean setParameter(String key, Object value) throws Exception	{
1023
		return setParameter(key, value, true);
1023
		return setParameter(key, value, false);
1024 1024
	}
1025 1025
	
1026 1026
	/**
......
1058 1058
			//}
1059 1059

  
1060 1060
			targetField.set(this, value);
1061
		}
1062
		//else
1063
		if (this.parent != null && bubble) {
1061
			
1062
			//this.dirty = this.dirty || hasParameterChanged(key);
1063
			
1064
		} else if (this.parent != null && bubble) {
1064 1065
			this.parent.setParameter(key, value);
1065 1066
		}
1066 1067

  
......
1766 1767
	 * @throws CqiClientExceptio
1767 1768
	 * @throws IOException
1768 1769
	 */
1769
	protected boolean compute(IProgressMonitor monitor, boolean deepComputing) throws Exception {
1770
	public boolean compute(IProgressMonitor monitor, boolean deepComputing) throws Exception {
1770 1771

  
1771 1772
		// FIXME: see if this skipComputing tests is still useful? is it possible to directly return instead?
1772 1773
		// en fait voir ChartResult.compute() if(super.compute(monitor, true, false)), je pense que le prob vient du fait que si on retourne false dans TXMResult.compute() alors renderChart() ne sera pas appelé 
......
1774 1775

  
1775 1776
		this.monitor = monitor;
1776 1777

  
1778
		// TODO THIS IS FUCKING LAZY LINE CODES OH YEAH YOU MAD BRO
1779
		// TODO where do we put this parent compute ? :o
1780
		//		if (parent != null && !parent.getHasBeenComputedOnce()) { // parent must be computed at least one time
1781
		// SJ: other way, test the object itself
1782
		if (this.parent != null && !(this.parent instanceof Project)) {
1783
			if (!this.parent.compute(monitor, true)) {
1784
				Log.severe("TXMResult.compute(): " + this.getClass().getSimpleName() + ": failed to compute parent result.");
1785

  
1786
				return false;
1787
			}
1788
		}
1777 1789
		
1778 1790
		if (!this.needsFullRecomputing && !this.isDirtyFromHistory() && !this.isDirty()) {
1779 1791
			// needsFullRecomputing == true && isDirtyFromHistory == true && isDirty == true
......
1787 1799
			Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing result of type " + this.getClass() + "...");
1788 1800

  
1789 1801

  
1790
			// TODO THIS IS FUCKING LAZY LINE CODES OH YEAH YOU MAD BRO
1791
			// TODO where do we put this parent compute ? :o
1792
			//		if (parent != null && !parent.getHasBeenComputedOnce()) { // parent must be computed at least one time
1793
			// SJ: other way, test the object itself
1794
			if (this.parent != null && !(this.parent instanceof Project)) {
1795
				if (!this.parent.compute(monitor, true)) {
1796
					Log.severe("TXMResult.compute(): " + this.getClass().getSimpleName() + ": failed to compute parent result.");
1797

  
1798
					//return false;
1799
				}
1800
			}
1801

  
1802 1802
			// Computing requirements test
1803 1803
			if (!this.canCompute()) {
1804 1804
				Log.severe("TXMResult.compute(): " + this.getClass().getSimpleName() + ": missing or wrong parameters, computing aborted.");

Formats disponibles : Unified diff