Révision 2606
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 2606) | ||
---|---|---|
1056 | 1056 |
// editorInput.getResult().compute(false); |
1057 | 1057 |
// } |
1058 | 1058 |
|
1059 |
boolean needComputing = true; |
|
1059 | 1060 |
|
1060 | 1061 |
// since some editor fields need some values of their parent, |
1061 | 1062 |
// ensure the parents branch is ready (e.g. Sub-corpus properties in Cooccurrence editor, etc.) |
... | ... | |
1067 | 1068 |
// the main task stays the compute of the result itself, not the parent |
1068 | 1069 |
AdvancedProgressMonitorDialog dialog = new AdvancedProgressMonitorDialog(window.getShell(), editorInput.getResult()); |
1069 | 1070 |
dialog.runComputingProcess(true); |
1071 |
|
|
1072 |
needComputing = false; |
|
1070 | 1073 |
} |
1071 | 1074 |
// user canceling case |
1072 | 1075 |
catch (InterruptedException e) { |
... | ... | |
1091 | 1094 |
else { |
1092 | 1095 |
// TODO until the TXMResult don't know if its parameters are set by the user or by the default preference value, we need to use the AUTO_COMPUTE_ON_EDITOR_OPEN preference |
1093 | 1096 |
// compute the result only if the editor wasn't already opened |
1094 |
if ((RCPPreferences.getInstance().getBoolean(RCPPreferences.AUTO_COMPUTE_ON_EDITOR_OPEN))) { |
|
1097 |
if (needComputing && (RCPPreferences.getInstance().getBoolean(RCPPreferences.AUTO_COMPUTE_ON_EDITOR_OPEN))) {
|
|
1095 | 1098 |
editor.compute(false); |
1096 | 1099 |
} |
1097 | 1100 |
else { |
Formats disponibles : Unified diff