Révision 1472

tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 1472)
781 781
						public void run() {
782 782
							if(update)	{
783 783

  
784
								if (TXMEditor.this.getResult().isAltered()) {
785
									if (!promptResultEditedAlert()) {
784
								if (TXMEditor.this.getResult().isAltered() && !promptResultEditedAlert()) {
786 785
										setCanceled(true);
787
									}
788 786
								}
787
								else	{
789 788

  
790
								// subclasses manual result updating from editor fields
791
								Log.finest("TXMEditor.syncrhonizeResultFromEditor(): " + TXMEditor.this.getClass().getSimpleName() + ": manually updating result from editor."); //$NON-NLS-1$
792
								updateResultFromEditor();
789
									// subclasses manual result updating from editor fields
790
									Log.finest("TXMEditor.compute(): " + TXMEditor.this.getClass().getSimpleName() + ": manually updating result from editor."); //$NON-NLS-1$
791
									updateResultFromEditor();
792
	
793
									 // auto updating result from Parameter annotations in result <=> editor
794
									Log.finest("TXMEditor.compute(): " + TXMEditor.this.getClass().getSimpleName() + ": auto updating result from editor."); //$NON-NLS-1$
795
									autoUpdateResultFromEditorParameters();
796
	
797
									// FIXME: SJ: useless at this time?
798
									// Stores the last parameters before the computing to later auto-update the Widgets only if some parameters have changed 
799
									//setLastComputingParameters(TXMEditor.this.getResult().getLastParametersFromHistory());
800
								}
793 801

  
794
								 // auto updating result from Parameter annotations in result <=> editor
795
								Log.finest("TXMEditor.syncrhonizeResultFromEditor(): " + TXMEditor.this.getClass().getSimpleName() + ": auto updating result from editor."); //$NON-NLS-1$
796
								autoUpdateResultFromEditorParameters();
797

  
798
								// Stores the last parameters before the computing to later auto-update the Widgets only if some parameters have changed 
799
								//setLastComputingParameters(TXMEditor.this.getResult().getLastParametersFromHistory());
800

  
801 802
							}
802 803
						}
803 804
					});

Formats disponibles : Unified diff