Revision 1100

tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 1100)
434 434
				positions[i++] = m.getStart();
435 435
				npositions++;
436 436
				this.worked(1);
437

  
438
				// FIXME: long process test for Thread user canceling
439
				//				System.err.println("Progression.stepQueries(): fixme: simulating a long process for canceling tests purpose.");
440
				//				for(long j = 0; j < 50000000L; j++)	{
441
				//					;
442
				//				}
443

  
444

  
445 437
			}
446 438
		}
447 439
		return npositions > 0;
tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java (revision 1100)
35 35
	public IStatus _build(Project project, IProgressMonitor monitor) {
36 36
		
37 37
		try {
38
			// check if TreeTagger if ready
38
			// check if TreeTagger is ready
39 39
			boolean annotate = project.getAnnotate();
40 40
			if (annotate) {
41 41
				Engine e = Toolbox.getEngineManager(EngineType.ANNOTATION).getEngine("TreeTagger");
42 42
				if (e == null) {
43
					System.out.println("Error: no TreeTagger annotation engine found to annotate the corpus. Aborting");
43
					Log.severe("Error: no TreeTagger annotation engine found to annotate the corpus. Aborting");
44 44
					return Status.CANCEL_STATUS;
45 45
				}
46 46
				AnnotationEngine engine = (AnnotationEngine) e;
47 47
				if (!engine.isRunning()) {
48
					System.out.println("Error: TreeTagger annotation engine is not ready please check TXM > Advance > TAL > TreeTagger preferences. Aborting");
48
					Log.severe("Error: TreeTagger annotation engine is not ready please check TXM > Advance > TAL > TreeTagger preferences. Aborting");
49 49
					return Status.CANCEL_STATUS;
50 50
				}
51 51
			}
......
77 77

  
78 78
			TokenizerClasses.reset();
79 79
			if (!TokenizerClasses.loadFromProject(project.getPreferences())) {
80
				System.out.println("Error: failed to load tokenizer parameters");
80
				Log.severe("Error: failed to load tokenizer parameters");
81 81
				monitor.done();
82 82
//				if (basedir.exists()) basedir.renameTo(errorBinDirectory);
83 83
//				if (tempBinDirectory.exists()) tempBinDirectory.renameTo(basedir);
......
85 85
			}
86 86

  
87 87
			ExecTimer.start();
88
			Log.info("Start of Groovy import script" + mainScript.getAbsolutePath()); //$NON-NLS-1$
88
			Log.info("Start of Groovy import script: " + mainScript.getAbsolutePath()); //$NON-NLS-1$
89 89
			gse.run(mainScript.toURI().toURL().toString(), binding); // run the groovy import script
90
			System.out.println("\nEnd of Groovy import script: "+ExecTimer.stop()); //$NON-NLS-1$
90
			Log.info("\nEnd of Groovy import script: " + ExecTimer.stop()); //$NON-NLS-1$
91 91
			monitor.worked(90);
92 92

  
93 93
			TokenizerClasses.reset();
tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/functions/LexicalTable.java (revision 1100)
544 544

  
545 545
	@Override
546 546
	public String getSimpleName() {
547
		// FIXME: old version, bugged, the name is not restored when reloading the result
548
//		if (!hasBeenComputedOnce) {
549
//			if (this.getLazyName() != null) {
550
//				return this.getLazyName();
551
//			}
552
//			else	{
553
//				return this.getEmptyName();
554
//			}
555
//		}
556
//		else {
557
//			StringBuilder strb = new StringBuilder();
558
//			if (property != null) {
559
//				strb.append(property.getName() + " ");
560
//			}
561
//			if (statsData != null) {
562
//				try {
563
//					strb.append(this.getFMin() + " / " + this.getNRows());
564
//				} catch (Exception e) {
565
//					// TODO Auto-generated catch block
566
//					e.printStackTrace();
567
//				}
568
//			}
569
//			if(strb.length() > 0)	{
570
//				return strb.toString();			
571
//			}
572
//			else	{
573
//				return this.getEmptyName();
574
//			}
575
//		}
576
		
577
		
578 547
		if (statsData != null) {
579 548
			StringBuilder strb = new StringBuilder();
580 549
			if (property != null) {
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java (revision 1100)
651 651
			}
652 652
		}
653 653
		
654
		//fMin.setSelection(this.getIntParameterValue(TXMPreferences.F_MIN));
655
		//TCount.setSelection(this.getIntParameterValue(CooccurrencePreferences.MIN_COUNT));
656
//		minScore.setText("" + this.getDoubleParameterValue(CooccurrencePreferences.MIN_SCORE));
657

  
658 654
		// Structural unit limit
659 655
		empantPanel.setStructure(this.cooc.getStructuralUnitLimit());
660 656
		

Also available in: Unified diff