Révision 1964

tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1964)
2636 2636
		return this.getSimpleName();
2637 2637
	}
2638 2638

  
2639
	/**
2640
	 * Default implementation getSimpleDetails
2641
	 * 
2642
	 * @return
2643
	 */
2644
	public String getSimpleDetails() {
2645
		return getDetails().replace("\n", " ");
2646
	}
2639 2647
}
tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 1964)
171 171

  
172 172
	public static String loadingExtensionPreInstallation;
173 173

  
174
	public static String initializingToolbox; 
174
	public static String initializingToolbox;
175

  
176
	public static String fminP0fmaxP1tP2vP3; 
175 177
	
176 178
	
177 179
	/**
tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 1964)
138 138
fillImportxmlWithColon = Fill ''import.xml'' file with: 
139 139

  
140 140
filterManagerErrorColonInitializationP0NotFound = ** Initialization error of the filter manager: {0} not found.
141

  
142
fminP0fmaxP1tP2vP3 = fmin {0} fmax {1} t {2} v {3}
141 143

  
142 144
fmax = , fmax 
143 145

  
tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java (revision 1964)
415 415
	public CQPCorpus getCorpus() {
416 416
		return (CQPCorpus) this.parent;
417 417
	}
418
	
419
	@Override
420
	public String getSimpleDetails() {
421
		return getComputingDoneMessage();
422
	}
418 423

  
419 424
	@Override
420 425
	public String getDetails() {
tmp/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java (revision 1964)
371 371
	
372 372
	@Override
373 373
	public String getComputingDoneMessage() {
374
		if(this.lines.isEmpty())	{
374
		if(this.lines == null || this.lines.isEmpty())	{
375 375
			return TXMCoreMessages.common_noResults;
376 376
		}
377 377
		else	{
tmp/org.txm.ahc.core/src/org/txm/ahc/core/functions/AHC.java (revision 1964)
36 36
import org.txm.ahc.core.preferences.AHCPreferences;
37 37
import org.txm.ca.core.functions.CA;
38 38
import org.txm.chartsengine.core.results.ChartResult;
39
import org.txm.core.messages.TXMCoreMessages;
39 40
import org.txm.core.results.Parameter;
40 41
import org.txm.core.results.TXMParameters;
41 42
import org.txm.lexicaltable.core.functions.LexicalTable;
......
702 703
		return NLS.bind(this.getName() + "\ncomputed with the {0} method and the {1} metric.", method, metric);
703 704
	}
704 705

  
706
	@Override
707
	public String getComputingDoneMessage() {
708
		if(hasBeenComputedOnce())	{
709
			return getSimpleDetails();
710
		}
711
		else	{
712
			return TXMCoreMessages.common_noResults;
713
		}
714
	}
705 715

  
706 716
	/**
707 717
	 * Gets the 2D rendering state.
tmp/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java (revision 1964)
231 231
		return getCorpus().getName()+" "+pStructuralUnit.getName()+" "+(pCurrentPage+1); //$NON-NLS-1$ //$NON-NLS-2$
232 232
	}
233 233

  
234
	@Override
235
	public String getComputingDoneMessage() {
236
		if (hasBeenComputedOnce()) {
237
			return getName();
238
		} else {
239
			return "";
240
		}
241
		//return TXMCoreMessages.common_done;
242
	}
234 243

  
235 244
	@Override
236 245
	public String getSimpleName() {
tmp/org.txm.ca.core/src/org/txm/ca/core/functions/CA.java (revision 1964)
771 771
			return "";
772 772
		}
773 773
	}
774
	
775
	@Override
776
	public String getComputingDoneMessage() {
777
		if(hasBeenComputedOnce())	{
778
			return getSimpleDetails();
779
		}
780
		else	{
781
			return TXMCoreMessages.common_noResults;
782
		}
783
	}
774 784

  
775 785
	@Override
776 786
	public String getName() {
tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 1964)
810 810
	
811 811
	@Override
812 812
	public String getComputingDoneMessage() {
813
		if(this.getAllPositions().isEmpty())	{
813
		if (this.getAllPositions() == null || this.getAllPositions().isEmpty())	{
814 814
			return TXMCoreMessages.common_noResults;
815 815
		}
816 816
		else {
......
822 822
		}
823 823
	}
824 824
	
825

  
826 825
	/**
827 826
	 * @return the bandeMultiplier
828 827
	 */
......
830 829
		return bandeMultiplier;
831 830
	}
832 831

  
833

  
834

  
835 832
	/**
836 833
	 * @param bandeMultiplier the bandeMultiplier to set
837 834
	 */
tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java (revision 1964)
487 487
			return getName();
488 488
		}
489 489
	}
490
	
491
	@Override
492
	public String getSimpleDetails() {
490 493

  
494
		try {
495
			if (hasBeenComputedOnce) {
496
				return TXMCoreMessages.bind(TXMCoreMessages.fminP0fmaxP1tP2vP3, getFmin(), getFmax(), getT(), getV());
497
			} else {
498
				return getName();
499
			}
500
		}
501
		catch(Exception e) {
502
			return getName();
503
		}
504
	}
505

  
491 506
	/**
492 507
	 * Gets the filter fmax.
493 508
	 *
tmp/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java (revision 1964)
188 188
		return (Partition)parent;
189 189
	}
190 190
	
191
	public String getComputingDoneMessage() {
192
		if(this.lines.isEmpty())	{
193
			return TXMCoreMessages.common_noResults;
194
		}
195
		else	{
196
			return TXMCoreMessages.bind(TXMCoreMessages.common_P0ItemsForP1Occurrences, this.lines.size(), this.nTotalTokens);
197
		}
198
	}
199
	
191 200
	@Override
192 201
	protected boolean _compute() throws Exception {
193 202
		lines.clear();
tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages_fr.properties (revision 1964)
28 28

  
29 29
numberOfWordProperties = Nombre de propriétés de mot 
30 30

  
31
numberOfWords = Nombre de mots 
31
numberOfWordsP0 = Nombre de mots : {0}
32 32

  
33 33
s = - S 
34 34

  
tmp/org.txm.properties.core/src/org/txm/properties/core/messages/PropertiesCoreMessages.java (revision 1964)
31 31
	public static String wordProperties; 
32 32
	public static String s; 
33 33
	public static String generalStatistics_2; 
34
	public static String numberOfWords; 
34
	public static String numberOfWordsP0; 
35 35
	public static String numberOfWordProperties; 
36 36
	public static String error_failedToAccessLexiconOfCorpusP0;
37 37
	public static String error_failedToAccessStructuresOfCorpusP0;
tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages.properties (revision 1964)
28 28

  
29 29
numberOfWordProperties = Number of word properties 
30 30

  
31
numberOfWords = Number of words 
31
numberOfWordsP0 = Number of words: {0}
32 32

  
33 33
s = - S 
34 34

  
tmp/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java (revision 1964)
303 303

  
304 304
		// counts
305 305
		buff.append("<ul>\n"); //$NON-NLS-1$
306
		buff.append("<li>" + PropertiesCoreMessages.numberOfWords + numberOfWords + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
306
		buff.append("<li>" + NLS.bind(PropertiesCoreMessages.numberOfWordsP0, numberOfWords) + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
307 307
		buff.append("<li>" + PropertiesCoreMessages.numberOfWordProperties + (NProperties - 1) + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
308 308
		buff.append("<li>" + PropertiesCoreMessages.numberOfStructuralUnits + NStructures + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
309 309
		buff.append("</ul>\n"); //$NON-NLS-1$
......
613 613

  
614 614
	@Override
615 615
	public String getDetails() {
616
		return String.valueOf(numberOfWords);
616
		if (numberOfWords >= 0) {
617
			return NLS.bind(PropertiesCoreMessages.numberOfWordsP0, numberOfWords);
618
		} else {
619
			return "";
620
		}
617 621
	}
618 622

  
619 623
	@Override
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java (revision 1964)
366 366

  
367 367
	@Override
368 368
	public String getDetails() {
369
		return NLS.bind(this.getName() + " ({0})", this.getPartsCount());
369
		return this.getName();
370 370
	}
371 371

  
372 372
	@Override
......
386 386
		return name;
387 387
	}
388 388
	
389
	
390 389
	@Override
391 390
	public String getComputingStartMessage() {
392 391
		return TXMCoreMessages.bind("Création de la partition {0} dans le corpus {1}...", this.getSimpleName(), this.getCorpus().getName());
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/MainCorpus.java (revision 1964)
332 332
		}
333 333
	}
334 334

  
335
	@Override
336
	public String getComputingDoneMessage() {
337
		if (hasBeenComputedOnce()) {
338
			return getDetails();
339
		} else {
340
			return "";
341
		}
342
		//return TXMCoreMessages.common_done;
343
	}
344
	
335 345
	/**
336 346
	 * Gets the first position.
337 347
	 *
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Subcorpus.java (revision 1964)
124 124
		return TXMCoreMessages.bind("Création du sous-corpus {0} dans le corpus {1}...", this.getSimpleName(), this.getParent().getName());
125 125
	}
126 126

  
127
	
128 127
	@Override
129 128
	public String getComputingDoneMessage() {
130
		return TXMCoreMessages.common_done;
129
		if (hasBeenComputedOnce()) {
130
			return getDetails();
131
		} else {
132
			return "";
133
		}
134
		//return TXMCoreMessages.common_done;
131 135
	}
132 136
	
133 137
	/*
134
	 * retro compatability method for import.xml file
138
	 * retro compatibility method for import.xml file
135 139
	 * 
136 140
	 * @see org.txm.searchengine.cqp.corpus.Corpus#getLocale()
137 141
	 */
tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java (revision 1964)
321 321
					//						mess = result.getCurrentName();
322 322
					//					}
323 323
					//					StatusLine.setMessage(mess);
324
					StatusLine.setMessage(((TXMResult)selectedItem).getName());
324
					StatusLine.setMessage(((TXMResult)selectedItem).getComputingDoneMessage());
325 325
				}
326 326

  
327 327
			}
tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificities.java (revision 1964)
673 673
	
674 674
	@Override
675 675
	public String getComputingDoneMessage() {
676
		return TXMCoreMessages.common_done;
676
		if(hasBeenComputedOnce())	{
677
			return getDetails();
678
		}
679
		else	{
680
			return TXMCoreMessages.common_noResults;
681
		}
677 682
	}
678 683
	
679
	
680 684
	@Override
681 685
	public boolean canCompute() {
682 686

  
......
729 733
	public String getResultType() {
730 734
		return SpecificitiesCoreMessages.RESULT_TYPE;
731 735
	}
732

  
733

  
734

  
735

  
736

  
737 736
}

Formats disponibles : Unified diff