Revision 1120

tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java (revision 1120)
371 371
	@Override
372 372
	public boolean saveParameters() {
373 373
			
374
		this.saveParameter(TBXPreferences.UNIT_PROPERTIES, WordProperty.propertiesToString(pProperties));
374
		this.saveParameter(TXMPreferences.UNIT_PROPERTIES, WordProperty.propertiesToString(pProperties));
375 375
		
376 376
		if (pQuery != null) {
377
			this.saveParameter(IndexPreferences.QUERY, pQuery.getQueryString());
377
			this.saveParameter(TXMPreferences.QUERY, pQuery.getQueryString());
378 378
		}
379 379
		
380 380
		
......
383 383
	
384 384
	@Override
385 385
	public boolean loadParameters() {
386
		this.pProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), this.getStringParameterValue(TBXPreferences.UNIT_PROPERTIES));
387
		this.pQuery = new CQLQuery(this.getStringParameterValue(IndexPreferences.QUERY));
386
		this.pProperties = (List<WordProperty>) Property.stringToProperties(getCorpus(), this.getStringParameterValue(TXMPreferences.UNIT_PROPERTIES));
387
		this.pQuery = new CQLQuery(this.getStringParameterValue(TXMPreferences.QUERY));
388 388
		return true;
389 389
	}
390 390
	
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 1120)
644 644

  
645 645
					notifyExtensions("notifyStartOfCompute"); //$NON-NLS-1$
646 646
					if (!TXMEditor.this.getResult().compute(monitor)) {
647
						Log.severe("TXMEditor.compute(): " + this.getClass().getSimpleName() + ": computing failed.");
648
						return Status.CANCEL_STATUS;
647
						Log.severe("TXMEditor.compute(): " + TXMEditor.this.getClass().getSimpleName() + ": computing failed.");
649 648
					}
650 649
					notifyExtensions("notifyEndOfCompute"); //$NON-NLS-1$
651 650

  
......
658 657
							try {
659 658
								refresh(update);
660 659
							} catch (Exception e) {
661
								Log.severe("TXMEditor.compute(): " + this.getClass().getSimpleName() + ": Error while refreshing the editor: " + e); //$NON-NLS-1$
660
								Log.severe("TXMEditor.compute(): " + TXMEditor.this.getClass().getSimpleName() + ": Error while refreshing the editor: " + e); //$NON-NLS-1$
662 661
								Log.printStackTrace(e);
663 662
							}
664 663
						}
......
717 716
			editor = (TXMEditor) page.openEditor(editorInput, editorId, true, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
718 717
			//editor.refresh(true);
719 718
			// computing the result only if the editor wasn't already opened
720
			if (wasAlreadyOpened)	{
719
			if (!wasAlreadyOpened)	{
721 720
				editor.compute(false);
722 721
			}
723 722
		}

Also available in: Unified diff