Révision 1161

tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1161)
1839 1839
			boolean d1 = this.needsFullRecomputing; // FIXME: SJ: need to try again to stop to use this parameter
1840 1840
			boolean d2 = this.isDirtyFromHistory();
1841 1841
			boolean d3 = this.isDirty();
1842
			if (
1843
					//!d1 && 
1844
					!d2 && !d3) {
1842
			if (!d1 && !d2 && !d3) {
1845 1843
				// needsFullRecomputing == true && isDirtyFromHistory == true && isDirty == true
1846 1844
				Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": result parameters have not changed since last computing, computing skipped.");
1847 1845
				skipComputing = true;
......
1898 1896
					TXMPreferences.flush(this);
1899 1897
				}
1900 1898
				
1901
				
1902 1899
				this.dirty = false; // the computing was successful, the result is no more dirty
1903 1900
				this.hasBeenComputedOnce = true; 
1904 1901
				this.needsFullRecomputing = false;
......
1914 1911
				if (deepComputing && parent != null) {
1915 1912

  
1916 1913
					Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": cascade computing of " + this.children.size() + " child(ren).");
1917

  
1918 1914
					
1919 1915
					for (int i = 0; i < this.children.size(); i++) {
1920 1916
						// FIXME: may be better to add a member needFullRecomputing in TXMResult?
......
1943 1939
		catch (Exception e) {
1944 1940
			// TODO Auto-generated catch block
1945 1941
			e.printStackTrace();
1946
			Log.severe("TXMResult.compute(): Exception occurs during computing.");
1942
			Log.severe("TXMResult.compute(): Exception occurs during computing: "+e);
1947 1943
			return false;
1948 1944
		}
1949 1945

  

Formats disponibles : Unified diff