Révision 2623
| tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 2623) | ||
|---|---|---|
| 2522 | 2522 |
// FIXME: SJ: in case of ThreadDeath we could for example call a method as Engine.interrupt(TXMResult) |
| 2523 | 2523 |
// so the engine can do some clean up, e.g. R destroying some objects, etc. |
| 2524 | 2524 |
// But we also have a TXMResult.clean() method that we could use |
| 2525 |
catch (ThreadDeath e) {
|
|
| 2525 |
catch (ThreadDeath | InterruptedException e) {
|
|
| 2526 | 2526 |
// set result and its children as canceled |
| 2527 | 2527 |
this.resetComputingState(); |
| 2528 |
throw new InterruptedException("TXMResult computing thread stopped."); //$NON-NLS-1$
|
|
| 2528 |
|
|
| 2529 |
Log.info(NLS.bind(TXMCoreMessages.info_cancelingComputingOfP0P1, this.getName(), this.getClass().getSimpleName())); |
|
| 2530 |
|
|
| 2531 |
if (e instanceof ThreadDeath) {
|
|
| 2532 |
throw new InterruptedException("TXMResult computing thread stopped."); //$NON-NLS-1$
|
|
| 2533 |
} |
|
| 2534 |
else {
|
|
| 2535 |
throw e; |
|
| 2536 |
} |
|
| 2529 | 2537 |
} |
| 2530 |
catch (InterruptedException e) {
|
|
| 2531 |
// set result and its children as canceled |
|
| 2532 |
this.resetComputingState(); |
|
| 2533 |
throw e; |
|
| 2534 |
} |
|
| 2535 | 2538 |
catch (Exception e) {
|
| 2536 | 2539 |
// set result and its children as canceled |
| 2537 | 2540 |
this.resetComputingState(); |
| ... | ... | |
| 2541 | 2544 |
return false; |
| 2542 | 2545 |
} |
| 2543 | 2546 |
|
| 2547 |
|
|
| 2548 |
Log.info(NLS.bind("Canceling computing of {0} ({1})...", this.getName(), this.getClass().getSimpleName()));
|
|
| 2549 |
|
|
| 2544 | 2550 |
// console log, only for visible result or if the log level is superior to info level |
| 2545 | 2551 |
if (!skipComputing && !this.getComputingDoneMessage().isEmpty() && (this.isVisible() || Log.isLoggingFineLevel())) {
|
| 2546 | 2552 |
Log.info(this.getComputingDoneMessage()); |
| tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 2623) | ||
|---|---|---|
| 63 | 63 |
|
| 64 | 64 |
public static String common_t; |
| 65 | 65 |
|
| 66 |
public static String info_cancelingComputingOfP0P1; |
|
| 67 |
|
|
| 66 | 68 |
public static String common_thresholds; |
| 67 | 69 |
|
| 68 | 70 |
public static String common_units; |
| tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties (revision 2623) | ||
|---|---|---|
| 161 | 161 |
|
| 162 | 162 |
in = \ dans\ \ \ \ \ \ \ \ |
| 163 | 163 |
|
| 164 |
info_computingChildrenOfP0P1 = Calcul des enfants de {0} ({1})...
|
|
| 165 |
info_p0P1Deleted = {0} "{1}" supprimé(e).
|
|
| 164 |
info_cancelingComputingOfP0P1 = Abandon du calcul de : {0} ({1})...
|
|
| 165 |
info_computingChildrenOfP0P1 = Calcul des enfants de {0} ({1})...
|
|
| 166 |
info_p0P1Deleted = {0} "{1}" supprimé(e).
|
|
| 166 | 167 |
|
| 167 | 168 |
initializationOfGroovyImportScriptRunner = Initialisation de GroovyImportScriptRunner |
| 168 | 169 |
|
| tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 2623) | ||
|---|---|---|
| 165 | 165 |
|
| 166 | 166 |
in = \ in \ \ \ \ \ \ \ \ |
| 167 | 167 |
|
| 168 |
info_computingChildrenOfP0P1 = Computing children of {0} ({1})...
|
|
| 169 |
info_p0P1Deleted = {0} "{1}" deleted.
|
|
| 168 |
info_cancelingComputingOfP0P1 = Canceling computing of {0} ({1})...
|
|
| 169 |
info_computingChildrenOfP0P1 = Computing children of {0} ({1})...
|
|
| 170 |
info_p0P1Deleted = {0} "{1}" deleted.
|
|
| 170 | 171 |
|
| 171 | 172 |
initializationOfGroovyImportScriptRunner = Initialization of GroovyImportScriptRunner |
| 172 | 173 |
|
| tmp/org.txm.core/src/java/org/txm/utils/TXMProgressMonitor.java (revision 2623) | ||
|---|---|---|
| 97 | 97 |
} |
| 98 | 98 |
|
| 99 | 99 |
/** |
| 100 |
* Splits the current computing monitor if exists and returns a new SubMonitor with 100 ticks of remaining work.
|
|
| 100 |
* Splits the current computing monitor if exists and returns a new {@link TXMProgressMonitor} with 100 ticks of remaining work.
|
|
| 101 | 101 |
* If current computing monitor doesn't exist, typically if calling this method outside of the TXMResult._compute() implementations, |
| 102 | 102 |
* it returns a new LogMonitor with 100 ticks. |
| 103 | 103 |
* |
Formats disponibles : Unified diff