Révision 1898

tmp/org.txm.progression.core/src/org/txm/progression/core/messages/ProgressionCoreMessages.java (revision 1898)
31 31
	
32 32
	
33 33
	public static String errorColonSubcorpusWithSize0; 
34
	public static String progressionOfP0InTheP1Corpus;
34 35
	
35 36
	
36 37
	static {
tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages.properties (revision 1898)
1
#TXM messages generated by the PluginMessagesManager class
2
#Tue Dec 18 10:24:08 CET 2018
3
density=(density)
4
doneColonNoMatchFound=Done\: no match found.
5
errorColonSubcorpusWithSize0=** Error\: the sub-corpus is empty
6
filteringREGEXColon=, filtering REGEX\: 
7
inP0=in {0}
8
occurrences=Occurrences
9
progressionOf=Progression of 
10
propertyColon=, property\: 
11
RESULT_TYPE=Progression
12
structureColon=structure\: 
13
tEqualsP0=T \= {0}
14
theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora=The Progression command is not available for discontinuous sub-corpora.
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
2
#TXM messages generated by the PluginMessagesManager class
3
#Tue Dec 18 10:24:08 CET 2018
4

  
5
RESULT_TYPE = Progression
6

  
7
density = (density)
8

  
9
doneColonNoMatchFound = Done: no match found.
10

  
11
errorColonSubcorpusWithSize0 = ** Error: the sub-corpus is empty
12

  
13
filteringREGEXColon = , filtering REGEX: 
14

  
15
inP0 = in {0}
16

  
17
occurrences = Occurrences
18

  
19
progressionOf = Progression of 
20

  
21
progressionOfP0InTheP1Corpus = Progression of <{0}> in the {1} corpus...
22

  
23
propertyColon = , property: 
24

  
25
structureColon = structure: 
26

  
27
tEqualsP0 = T = {0}
28

  
29
theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora = The Progression command is not available for discontinuous sub-corpora.
tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_ru.properties (revision 1898)
1
#TXM messages generated by the PluginMessagesManager class
2
#Tue Dec 18 10:24:08 CET 2018
3
RESULT_TYPE=Прогрессия
4
theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora=Функция Прогрессия в настоящее время недоступна на прерывных подкорпусах.
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
2
#TXM messages generated by the PluginMessagesManager class
3
#Tue Dec 18 10:24:08 CET 2018
4

  
5
RESULT_TYPE = Прогрессия
6

  
7
progressionOfP0InTheP1Corpus = 
8

  
9
theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora = Функция Прогрессия в настоящее время недоступна на прерывных подкорпусах.
tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_fr.properties (revision 1898)
1
#TXM messages generated by the PluginMessagesManager class
2
#Tue Dec 18 10:24:08 CET 2018
3
density=(densité)
4
doneColonNoMatchFound=Terminé\: pas de correspondance trouvée.
5
errorColonSubcorpusWithSize0=** Erreur \: le sous-corpus est vide
6
filteringREGEXColon=, REGEX de filtrage \: 
7
inP0=dans {0}
8
occurrences=Occurrences
9
progressionOf=Progression de 
10
propertyColon=, propriété \:  
11
RESULT_TYPE=Progression
12
structureColon=structure \:  
13
tEqualsP0=T \= {0}
14
theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora=La fonctionnalité Progression n'est pas disponible pour les sous-corpus discontinus.
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
2
#TXM messages generated by the PluginMessagesManager class
3
#Tue Dec 18 10:24:08 CET 2018
4

  
5
RESULT_TYPE = Progression
6

  
7
density = (densité)
8

  
9
doneColonNoMatchFound = Terminé: pas de correspondance trouvée.
10

  
11
errorColonSubcorpusWithSize0 = ** Erreur : le sous-corpus est vide
12

  
13
filteringREGEXColon = , REGEX de filtrage : 
14

  
15
inP0 = dans {0}
16

  
17
occurrences = Occurrences
18

  
19
progressionOf = Progression de 
20

  
21
progressionOfP0InTheP1Corpus = Progression de <{0}> dans le corpus {1}...
22

  
23
propertyColon = , propriété :  
24

  
25
structureColon = structure :  
26

  
27
tEqualsP0 = T = {0}
28

  
29
theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora = La fonctionnalité Progression n'est pas disponible pour les sous-corpus discontinus.
tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 1898)
42 42
import org.apache.commons.lang.StringUtils;
43 43
import org.txm.chartsengine.core.results.ChartResult;
44 44
import org.txm.chartsengine.r.core.themes.DefaultTheme;
45
import org.txm.core.preferences.TBXPreferences;
45
import org.txm.core.messages.TXMCoreMessages;
46 46
import org.txm.core.preferences.TXMPreferences;
47 47
import org.txm.core.results.Parameter;
48 48
import org.txm.core.results.TXMParameters;
49
import org.txm.core.results.TXMResult;
50 49
import org.txm.progression.core.messages.ProgressionCoreMessages;
51 50
import org.txm.progression.core.preferences.ProgressionPreferences;
52 51
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
......
57 56
import org.txm.searchengine.cqp.corpus.StructuralUnit;
58 57
import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
59 58
import org.txm.searchengine.cqp.corpus.Subcorpus;
59
import org.txm.searchengine.cqp.corpus.query.CQLQuery;
60 60
import org.txm.searchengine.cqp.corpus.query.Match;
61
import org.txm.searchengine.cqp.corpus.query.CQLQuery;
62 61
import org.txm.searchengine.cqp.serverException.CqiServerError;
63 62
import org.txm.utils.logger.Log;
64 63

  
......
304 303

  
305 304
			this.subTask("Processing queries...");
306 305
			if (!this.stepQueries()) {
307
				Log.severe(ProgressionCoreMessages.doneColonNoMatchFound);
308
				return false;
306
				return true;
309 307
			}
310 308

  
311 309
			if (this.isCanceled())	{
......
804 802
	}
805 803

  
806 804

  
805
	@Override
806
	public String getComputingStartMessage() {
807
		return TXMCoreMessages.bind(ProgressionCoreMessages.progressionOfP0InTheP1Corpus, this.queries.toString(), this.getCorpus().getName());
808
	}
807 809

  
810
	
811
	@Override
812
	public String getComputingDoneMessage() {
813
		if(this.getAllPositions().isEmpty())	{
814
			return TXMCoreMessages.common_noResults;
815
		}
816
		else {
817
			String positions = String.valueOf(this.getAllPositions().get(0).length);
818
			for (int i = 1; i < this.getAllPositions().size(); i++) {
819
				positions += ", " + String.valueOf(this.getAllPositions().get(i).length); //$NON-NLS-1$
820
			}
821
			return TXMCoreMessages.bind(TXMCoreMessages.common_P0Positions, positions);
822
		}
823
	}
824
	
825

  
808 826
	/**
809 827
	 * @return the bandeMultiplier
810 828
	 */

Formats disponibles : Unified diff