Revision 1902

tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1902)
1789 1789
	 */
1790 1790
	public abstract String getDetails();
1791 1791

  
1792
	
1792 1793
	/**
1794
	 * Gets a message indicating the start of computing.
1795
	 * Dedicated to indicate the start of computing and, for example, the parameters used for the computing.
1796
	 * 
1797
	 * @return
1798
	 */
1799
	// FIXME: SJ: this method must become abstract in TXM0.8.1 and implemented by subclasses
1800
	public String getComputingStartMessage() {
1801
		return "";
1802
	}
1803
//	public abstract String getComputingStartMessage();
1804

  
1805
	
1806
	/**
1807
	 * Gets a message indicating the computing is done.
1808
	 * Dedicated to indicate the end of computing and, for example, some informations about the result (eg. : 12 matches found, No matches found, etc.).
1809
	 * 
1810
	 * @return
1811
	 */
1812
	// FIXME: SJ: this method must become abstract in TXM0.8.1 and implemented by subclasses
1813
	public String getComputingDoneMessage() {
1814
		return "";
1815
	}
1816
//	public abstract String getComputingDoneMessage();
1817

  
1818
	
1819
	
1820
	
1821
	
1822

  
1823
	
1824
	/**
1793 1825
	 * Gets the user name if exists otherwise, the lazy name if exists, otherwise the simple name.
1794 1826
	 * 
1795 1827
	 * @return the current name
......
2056 2088
	 */
2057 2089
	public abstract boolean canCompute() throws Exception;
2058 2090

  
2059
	/**
2060
	 * render the object getDetails() String in one line
2061
	 */
2062
	public final String getSimpleDetails() {
2063
		String mess = this.getDetails();
2064
		if (mess != null)
2065
			return mess.replace("\n", " ").replace("\t", " ");
2066 2091

  
2067
		return this.toString();
2068
	}
2069

  
2070 2092
	/**
2071 2093
	 * 
2072 2094
	 */
......
2147 2169

  
2148 2170
			Log.finest("*** TXMResult.compute(): " + this.getClass().getSimpleName() + ": starting computing process...");
2149 2171

  
2172
			
2150 2173
			// FIXME: SJ: see if this skipComputing tests is still useful? is it possible to directly return instead?
2151 2174
			// en fait voir ChartResult.compute() if(super.compute(monitor, true, false)), je pense que le prob vient du fait que si on retourne false dans TXMResult.compute() alors renderChart() ne sera pas appelé
2152 2175
			// il faudrait retourner un état: skipped, computed, error, etc. 
......
2177 2200

  
2178 2201
			if(!skipComputing)	{
2179 2202

  
2203
				
2180 2204
				// Debug
2181 2205
				Log.finest("+++ TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing result of type " + this.getClass() + "...");
2182 2206

  
......
2187 2211
					return false;
2188 2212
				}
2189 2213

  
2214
				//Log.info(this.getComputingStartMessage());
2215

  
2216
				
2190 2217
				// Computing
2191 2218
				if (!this._compute()) {
2192 2219
					Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing failed.");
......
2233 2260
				}
2234 2261
				this.altered = false;
2235 2262
				Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing of result type " + this.getClass() + " done.");
2263
				
2264
				//Log.info(this.getComputingDoneMessage());
2265

  
2266
				
2236 2267
			}
2237 2268
			
2238 2269
			
......
2368 2399
			monitor.worked(amount);
2369 2400
			this.subTask(message);
2370 2401
		}
2371
		Log.info(message);
2402
		Log.fine(message);
2372 2403
	}
2373 2404

  
2374 2405
	@Override
......
2376 2407
		if (monitor != null) {
2377 2408
			monitor.beginTask(name, totalWork);
2378 2409
		}
2379
		Log.info(name);
2410
		Log.fine(name);
2380 2411
	}
2381 2412

  
2382 2413
	@Override
tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties (revision 1902)
2 2
#TXM messages generated by the PluginMessagesManager class
3 3
#Tue Dec 18 10:24:08 CET 2018
4 4

  
5
common_cancel          = 
6
common_cols            = 
7
common_delete          = удалить
8
common_description     = Описание
9
common_fMax            = 
10
common_fMin            = 
11
common_frequency       = Частотность
12
common_lowestFrequency = Минимальная частотность
13
common_numberOfLines   = Число строк
14
common_ok              = OK
15
common_property        = Свойство
16
common_queriesColonP0  = Запросы: {0}.
17
common_query           = Запрос:
18
common_structure       = Структура
19
common_thresholds      = Пороги
20
common_units           = Единицы
21
common_warning         = Внимание
5
P0BuiltParts = 
22 6

  
7
common_P0ItemsForP1Occurrences = 
8
common_P0Occurrences           = 
9
common_P0Positions             = 
10
common_cancel                  = 
11
common_cols                    = 
12
common_delete                  = удалить
13
common_description             = Описание
14
common_fMax                    = 
15
common_fMin                    = 
16
common_frequency               = Частотность
17
common_lowestFrequency         = Минимальная частотность
18
common_noResults               = 
19
common_numberOfLines           = Число строк
20
common_ok                      = OK
21
common_property                = Свойство
22
common_queriesColonP0          = Запросы: {0}.
23
common_query                   = Запрос:
24
common_structure               = Структура
25
common_thresholds              = Пороги
26
common_units                   = Единицы
27
common_warning                 = Внимание
28

  
23 29
couldNotCreateTXMHOMEDirectoryColonP0 = ** Не удалось создать папку TXMHOME : {0}
24 30

  
25 31
error_error                   = ** Ошибка: {0}
tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 1902)
17 17
	
18 18
	private static final String BUNDLE_NAME = "org.txm.core.messages.messages"; //$NON-NLS-1$
19 19
	
20
	public static String common_absoluteFrequency;
21
	public static String common_cancel;
20 22
	public static String common_cols;
21 23
	public static String common_delete;
22 24
	public static String common_description;
23 25
	public static String common_done;
24 26
	public static String common_fMax;
25 27
	public static String common_fMin;
28
	public static String common_fMinEquals; 
26 29
	public static String common_frequency;
27 30
	public static String common_lowestFrequency;
28 31
	public static String common_numberOfLines;
29 32
	public static String common_ok;
30
	public static String common_cancel;
31 33
	public static String common_properties;
32 34
	public static String common_property;
33 35
	public static String common_queriesColonP0;
......
36 38
	public static String common_rows;
37 39
	public static String common_structuralUnitAndProperty;
38 40
	public static String common_structure;
41
	public static String common_t;
39 42
	public static String common_thresholds;
40 43
	public static String common_units;
41
	public static String common_t;
42 44
	public static String common_vMax;
43 45
	public static String common_warning;
44

  
46
	public static String common_noResults;
47
	public static String common_P0Occurrences;
48
	public static String common_P0Positions;
49
	public static String common_P0ItemsForP1Occurrences;
45 50
	
46 51
	
47 52
	public static String error_error2;
48 53
	public static String error_error;
49 54
	public static String error_errorWhileSortingResult;
50 55

  
51

  
56
	public static String P0BuiltParts;
52 57
	
53
	public static String couldNotCreateTXMHOMEDirectoryColonP0; 
54
	public static String evaluatingExtensionColonP0FromP1; 
55
	public static String loadingExtensions; 
56
	public static String failedToCopyTXMFilesFromTXMINSTALLDIRToTXMHOMEColonP0; 
57
	public static String exceptionColonP0; 
58
	public static String fmax; 
59
	public static String fmin; 
60
	public static String v; 
61

  
62 58
	
63

  
64 59
	
65
	public static String common_absoluteFrequency;
66

  
60
	public static String ToolboxStatesWorkspaceColonP0; 
67 61
	public static String binaryDirectoryP0NotFound; 
68
	public static String parentDirectoryP0NotFound; 
69
	public static String errorColonLinkGrplinkAttargetMalformedColonP0; 
62
	public static String cQiClientNotInitialized; 
63
	public static String cantFindStructuralUnitForMetadataWithIdColon; 
70 64
	public static String catalogFileNotFoundP0; 
71
	public static String managerErrorDuringInitializationColonP0NotFound; 
72
	public static String computingColon; 
73
	public static String registryFileIsMissingColonP0; 
74
	public static String htmlDirectoryIsMissingColonP0; 
75
	public static String processing; 
76
	public static String reorganizingFilesOfP0; 
77
	public static String readCorpusInfosFromOldImportxmlFileColonP0; 
78
	public static String isMissing; 
79
	public static String fillImportxmlWithColon; 
80
	public static String processingTextColonP0; 
81 65
	public static String checkingBinaryFormat; 
82
	public static String txmDirectoryIsMissingColonP0; 
83
	public static String dataDirectoryIsMissingColonP0; 
84
	public static String failedToRestoreSubcorpus; 
85
	public static String corpusColongetLocaleColonCQPIsNotReadyToAnswerColon; 
86
	public static String warningColonCantLoadCorpus; 
87
	public static String informationsFromWorkspaceSelfElementNull; 
88
	public static String failedToRestorePartition; 
66
	public static String computingColon; 
67
	public static String connectedToCQP; 
89 68
	public static String corpusColon; 
69
	public static String corpusColongetLocaleColonCQPIsNotReadyToAnswerColon; 
70
	public static String couldNotCreateTXMHOMEDirectoryColonP0; 
71
	public static String couldntReadCorpusColon; 
72
	public static String dataDirectoryIsMissingColonP0; 
73
	public static String doesNotExists; 
74
	public static String eRRORColonExists; 
75
	public static String eRRORColonRead; 
90 76
	public static String encodingColon; 
91
	public static String languageColon; 
92
	public static String noValuesGiven; 
93
	public static String in; 
94
	public static String cQiClientNotInitialized; 
77
	public static String endOfCQPWaitTest; 
78
	public static String errorColonLinkGrplinkAttargetMalformedColonP0; 
79
	public static String errorColonP0; 
80
	public static String errorColonP0CorpusDirectoryIsNotConformantToTXM079CorpusBinaryFormatColonCorpusSkipped; 
81
	public static String errorColonP0CorpusDirectoryIsNotConformantToTXMCorpusBinaryFormatColonCorpusSkipped; 
82
	public static String errorColonSkippingTheLoadingOfTheP0Corpus; 
83
	public static String errorColonTheConnexionToTheServerFailedColonWrongPortFormat; 
95 84
	public static String errorColonThisExceptionShouldNotBeThrown; 
96

  
97 85
	public static String errorColonWhileConnectionToSearchEngineWithTheFollowingParametersColon; 
98
	public static String readError; 
86
	public static String errorConfigdirDirColon; 
87
	public static String errorDuringWorkspaceInitializationColonP0; 
88
	public static String errorLoadingWorkspaceFromFileColonP0; 
89
	public static String errorRegDirColon; 
90
	public static String errorWhileConnectingToSearchEngine; 
91
	public static String errorWhileGettingMetadatasFromBaseimportMetadatasColon; 
92
	public static String errorWhileWaitingForCQP; 
93
	public static String evaluatingExtensionColonP0FromP1; 
94
	public static String exceptionColonP0; 
95
	public static String failedToAccessStructuralPropertyValues; 
96
	public static String failedToCopyTXMFilesFromTXMINSTALLDIRToTXMHOMEColonP0; 
97
	public static String failedToCreatePartColon; 
98
	public static String failedToExec; 
99
	public static String failedToExecTaskkillIMCqpserverexeFColon; 
100
	public static String failedToExecTskillCqpserverexeColon; 
101
	public static String failedToGetLastCQPErrorColon; 
102
	public static String failedToGetSupValuesOf; 
103
	public static String failedToLoadBaseParametersFromTheP0File; 
104
	public static String failedToRestorePartition; 
105
	public static String failedToRestoreSubcorpus; 
106
	public static String failedToStartMemCqiClientColon; 
107
	public static String file; 
108
	public static String fillImportxmlWithColon; 
99 109
	public static String filterManagerErrorColonInitializationP0NotFound; 
100
	public static String theFocusIsEmptyOrNull; 
110
	public static String fmax; 
111
	public static String fmin; 
112
	public static String focusIsEmptyOrNull; 
113
	public static String hasNoBase; 
114
	public static String htmlDirectoryIsMissingColonP0; 
115
	public static String iOColon; 
116
	public static String in; 
117
	public static String informationsFromWorkspaceSelfElementNull; 
101 118
	public static String initializationOfGroovyImportScriptRunner; 
102
	public static String supBeginningExecutionOfP0; 
103
	public static String supEndOfExecution; 
119
	public static String isMissing; 
104 120
	public static String isNotAValidCQPIDForACorpusItMustBeInUppercaseCharacters; 
105
	
106
	
121
	public static String isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters; 
122
	public static String languageColon; 
123
	public static String loadingExtensions; 
124
	public static String loadingWorkspaceFromFileColonP0; 
107 125
	public static String malformedURLFileP0; 
108
	public static String failedToGetLastCQPErrorColon; 
109
	public static String failedToCreatePartColon; 
126
	public static String managerErrorDuringInitializationColonP0NotFound; 
127
	public static String matchesFound; 
128
	public static String noValuesGiven; 
129
	public static String noWorkspaceFoundCreatingANewOneP0; 
130
	public static String numberOfMatch; 
131
	public static String numberOfSubMatch; 
132
	public static String orTheEngineWasNotStartedWithTheCommandLineColon; 
133
	public static String pARAMSColonP0; 
134
	public static String parentDirectoryP0NotFound; 
135
	public static String processing; 
136
	public static String processingTextColonP0; 
137
	public static String queryOnP0ColonP1InfP2; 
138
	public static String queryWasColon; 
139
	public static String queryingPartitionP0; 
140
	public static String readCorpusInfosFromOldImportxmlFileColonP0; 
141
	public static String readError; 
142
	public static String registryFileIsMissingColonP0; 
143
	public static String reorganizingFilesOfP0; 
144
	public static String sAXColon; 
145
	public static String selectionErrorColonTheCorpus; 
146
	public static String supBeginningExecutionOfP0; 
147
	public static String supEndOfExecution; 
148
	public static String tXMNeedsFoldersColonP0P1P2AndP3; 
149
	public static String textMetadataColon; 
110 150
	public static String theFocusCannotBeNullOrEmpty; 
111
	public static String focusIsEmptyOrNull; 
151
	public static String theFocusIsEmptyOrNull; 
112 152
	public static String theP0PartFocusDoesntBelongToPartitionP1; 
153
	public static String txmDirectoryIsMissingColonP0; 
113 154
	public static String unknownPartitionName; 
114
	public static String failedToLoadBaseParametersFromTheP0File; 
115
	public static String errorColonSkippingTheLoadingOfTheP0Corpus; 
116
	public static String pARAMSColonP0; 
117
	public static String errorColonP0CorpusDirectoryIsNotConformantToTXMCorpusBinaryFormatColonCorpusSkipped; 
118
	public static String errorColonP0CorpusDirectoryIsNotConformantToTXM079CorpusBinaryFormatColonCorpusSkipped; 
119
	public static String tXMNeedsFoldersColonP0P1P2AndP3; 
120
	public static String queryOnP0ColonP1InfP2; 
155
	public static String v; 
156
	public static String warningColonCantLoadCorpus; 
121 157
	public static String warningColonDuplicateQueryEntryColonP0; 
122 158
	public static String warningColonQueryFailedColonP0; 
123
	public static String queryingPartitionP0; 
124
	public static String isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters; 
125
	public static String failedToGetSupValuesOf; 
126
	public static String textMetadataColon; 
127
	public static String selectionErrorColonTheCorpus; 
128
	public static String hasNoBase; 
129
	public static String cantFindStructuralUnitForMetadataWithIdColon; 
130
	public static String errorWhileGettingMetadatasFromBaseimportMetadatasColon; 
131
	public static String failedToAccessStructuralPropertyValues; 
132
	public static String eRRORColonExists; 
133
	public static String eRRORColonRead; 
134
	public static String iOColon; 
135
	public static String sAXColon; 
136
	public static String file; 
137
	public static String noWorkspaceFoundCreatingANewOneP0; 
138
	public static String loadingWorkspaceFromFileColonP0; 
139
	public static String errorLoadingWorkspaceFromFileColonP0; 
140
	public static String errorColonP0; 
141
	public static String doesNotExists; 
142
	public static String endOfCQPWaitTest; 
143
	public static String errorWhileWaitingForCQP; 
144
	public static String ToolboxStatesWorkspaceColonP0; 
145
	public static String failedToStartMemCqiClientColon; 
146
	public static String errorWhileConnectingToSearchEngine; 
147 159
	public static String wrongLoginOrPasswordOrPortColon; 
148
	public static String failedToExecTaskkillIMCqpserverexeFColon; 
149
	public static String orTheEngineWasNotStartedWithTheCommandLineColon; 
150
	public static String failedToExecTskillCqpserverexeColon; 
151
	public static String failedToExec; 
152
	public static String connectedToCQP; 
153
	public static String errorDuringWorkspaceInitializationColonP0; 
154
	public static String errorColonTheConnexionToTheServerFailedColonWrongPortFormat; 
155
	public static String queryWasColon; 
156
	public static String matchesFound; 
157
	public static String couldntReadCorpusColon; 
158
	public static String errorRegDirColon; 
159
	public static String errorConfigdirDirColon; 
160
	public static String numberOfMatch; 
161
	public static String numberOfSubMatch; 
162 160
	public static String xmlValidationColonP0DoesNotExists;
163 161
	public static String xmlValidationColonP0IsADirectory; 
164 162
	public static String xmlValidationColonP0IsNotReadable; 
165

  
166

  
167
	public static String common_fMinEquals; 
168 163
	
169 164
	
170 165
	/**
tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties (revision 1902)
2 2
#TXM messages generated by the PluginMessagesManager class
3 3
#Tue Dec 18 10:24:08 CET 2018
4 4

  
5
P0BuiltParts = {0} built part(s).
6

  
5 7
ToolboxStatesWorkspaceColonP0 = \ Espace de travail : {0}
6 8

  
7 9
binaryDirectoryP0NotFound = Impossible de trouver le répertoire de corpus binaire {0}.
......
14 16

  
15 17
checkingBinaryFormat = Vérification du format du corpus binaire…
16 18

  
19
common_P0ItemsForP1Occurrences   = {0} item(s) pour {1} occurrence(s).
20
common_P0Occurrences             = {0} occurrence(s).
21
common_P0Positions               = {0} position(s).
17 22
common_absoluteFrequency         = Fréquence absolue
18 23
common_cancel                    = Annuler
19 24
common_cols                      = Colonnes
......
25 30
common_fMinEquals                = Fmin={0}
26 31
common_frequency                 = Fréquence
27 32
common_lowestFrequency           = Fréquence minimale
33
common_noResults                 = Aucun résultat.
28 34
common_numberOfLines             = Nombre de lignes
29 35
common_ok                        = OK
30 36
common_properties                = Propriétés :
......
183 189

  
184 190
parentDirectoryP0NotFound = Dossier parent ''{0}'' introuvable.
185 191

  
186

  
187 192
processing = Traitement en cours…
188 193

  
189 194
processingTextColonP0 = Traitement du fichier ''{0}''...
tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 1902)
2 2
#TXM messages generated by the PluginMessagesManager class
3 3
#Tue Dec 18 10:24:08 CET 2018
4 4

  
5
P0BuiltParts = {0} partie(s) construite(s).
6

  
5 7
ToolboxStatesWorkspaceColonP0 = \ Workspace: {0}
6 8

  
7 9
binaryDirectoryP0NotFound = Corpus binary folder {0} not found.
......
14 16

  
15 17
checkingBinaryFormat = Checking binary corpus format...
16 18

  
19
common_P0ItemsForP1Occurrences   = {0} item(s) for {1} occurrence(s).
20
common_P0Occurrences             = {0} occurrence(s).
21
common_P0Positions               = {0} position(s).
17 22
common_absoluteFrequency         = Absolute Frequency
18 23
common_cancel                    = Cancel
19 24
common_cols                      = Columns
......
25 30
common_fMinEquals                = Fmin={0}
26 31
common_frequency                 = Frequency
27 32
common_lowestFrequency           = Lowest frequency
33
common_noResults                 = No results.
28 34
common_numberOfLines             = Number of lines
29 35
common_ok                        = OK
30 36
common_properties                = Properties:
......
183 189

  
184 190
parentDirectoryP0NotFound = Parent folder ''{0}'' not found.
185 191

  
186

  
187 192
processing = Processing...
188 193

  
189 194
processingTextColonP0 = Processing file ''{0}''...
......
233 238
warningColonQueryFailedColonP0 = Warning: query {0} failed.
234 239

  
235 240
wrongLoginOrPasswordOrPortColon = Wrong login, password, host or port in : {0}, {1}, {2} ,{3}.
236

  
237
xmlValidationColonP0DoesNotExists = XML Validation: {0} does not exists ?
238

  
239
xmlValidationColonP0IsADirectory = XML Validation: {0} is a directory.
240

  
241
xmlValidationColonP0IsNotReadable = XML Validation: {0} is not readable.
241

  
242
xmlValidationColonP0DoesNotExists = XML Validation: {0} does not exists ?
243

  
244
xmlValidationColonP0IsADirectory = XML Validation: {0} is a directory.
245

  
246
xmlValidationColonP0IsNotReadable = XML Validation: {0} is not readable.

Also available in: Unified diff