Révision 2452

tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages_fr.properties (revision 2452)
6 6

  
7 7
deletingSubcorpusP0 = Suppression du sous-corpus {0}…
8 8

  
9
info_computingCorpusP0                                                 = Calcul du corpus {0}...
10
info_computingTheP0PartitionOfTheP1Corpus                              = Calcul de la partition {0} du corpus {1}...
9 11
info_computingTheP0SubCorpusOfP1CommaQueryP2                           = Calcul du sous-corpus {0} de {1}, requête : [{2}]...
10 12
info_computingTheP0SubCorpusOfP1CommaStructureP2CommaPropertyP3ColonP4 = Calcul du sous-corpus {0} de {1}, structure {2}, propriété {3} : {4}...
11 13
info_creatingNewPartition                                              = Création de la partition {1} du corpus {0}…
12 14
info_creatingSubcorpusXFromCorpusYWithTheQueryZ                        = Création du sous-corpus {0} du corpus {1} avec la requête {2}…
13 15
info_deletingPartition                                                 = Suppression de la partition {0}…
16
info_doneP0Parts                                                       = Terminé : {0} partie(s).
14 17
info_partCreatedInXMs                                                  = Partie {0} créée en {1} ms.
15 18
info_partXCreatedWithQueryZ                                            = Partie {0} créée avec la requête {1}.
16 19
info_partitionCreatedInXMs                                             = Partition {0} créée en {1} ms.
tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/SearchEngineCoreMessages.java (revision 2452)
45 45
	
46 46
	
47 47
	
48
	public static String info_computingTheP0PartitionOfTheP1Corpus;
49
	
50
	public static String info_computingCorpusP0;
51
	
52
	public static String info_doneP0Parts;
53
	
54
	
55
	
56
	
48 57
	static {
49 58
		// initialize resource bundle
50 59
		Utf8NLS.initializeMessages(BUNDLE_NAME, SearchEngineCoreMessages.class);
tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages.properties (revision 2452)
6 6

  
7 7
deletingSubcorpusP0 = Deleting sub-corpus {0}…
8 8

  
9
info_computingCorpusP0                                                 = Computing corpus {0}...
10
info_computingTheP0PartitionOfTheP1Corpus                              = Computing the {0} partition of the {1} corpus...
9 11
info_computingTheP0SubCorpusOfP1CommaQueryP2                           = Computing the {0} sub-corpus of {1}, query: {2}...
10 12
info_computingTheP0SubCorpusOfP1CommaStructureP2CommaPropertyP3ColonP4 = Computing the {0} sub-corpus of {1}, structure {2}, property {3}: {4}...
11 13
info_creatingNewPartition                                              = Creating partition {1} of corpus {0}…
12 14
info_creatingSubcorpusXFromCorpusYWithTheQueryZ                        = Creating sub-corpus {0} of corpus {1} with the query {2}…
13 15
info_deletingPartition                                                 = Deleting partition {0}…
16
info_doneP0Parts                                                       = Done: {0} part(s).
14 17
info_partCreatedInXMs                                                  = Part {0} created in {1} ms.
15 18
info_partXCreatedWithQueryZ                                            = Part {0} created with query {1}.
16 19
info_partitionCreatedInXMs                                             = Partition {0} created in {1} ms.
tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 2452)
4 4

  
5 5
BaseOldParameters_96 = Warning no corpus element defined in the {0} file. The corpus won't be correctly loaded.
6 6

  
7
P0BuiltParts = {0} partie(s) construite(s).
8

  
9 7
ToolboxStatesWorkspaceColonP0 = \ Workspace: {0}
10 8

  
11 9
binaryDirectoryP0NotFound = Corpus binary folder {0} not found.
......
167 165

  
168 166
in = \ in \	\	\	\	\	\	\	\	
169 167

  
168
info_computingChildrenOfP0 = Computing children of {0}
169
info_p0P1Deleted           = {0} "{1}" deleted.
170

  
170 171
initializationOfGroovyImportScriptRunner = Initialization of GroovyImportScriptRunner
171 172

  
172 173
initializingCorpora = Initializing corpora ({0}/{1})...
tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 2452)
79 79
	
80 80
	public static String common_P0ItemsForP1Occurrences;
81 81
	
82
	public static String info_p0P1Deleted;
82 83
	
84
	public static String info_computingChildrenOfP0;
85
	
86
	
87
	
83 88
	public static String error_error2;
84 89
	
85 90
	public static String error_error;
86 91
	
87 92
	public static String error_errorWhileSortingResult;
88 93
	
89
	public static String P0BuiltParts;
90
	
91 94
	public static String corpusImportDoneInP0;
92 95
	
93 96
	public static String corpusUpdateDoneInP0;
tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties (revision 2452)
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

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

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

  
164 162
in = \ dans\	\	\	\	\	\	\	\	
165 163

  
164
info_computingChildrenOfP0 = Calcul des enfants de {0}
165
info_p0P1Deleted           = {0} "{1}" supprimé(e).
166

  
166 167
initializationOfGroovyImportScriptRunner = Initialisation de GroovyImportScriptRunner
167 168

  
168 169
initializingCorpora = Initialisation des corpus ({0}/{1})...
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 2452)
1408 1408
				
1409 1409
			}
1410 1410
			this.parent = null;
1411
			
1412
			// log
1413
			if (this.isVisible() || Log.isLoggingFine()) {
1414
				Log.info(TXMCoreMessages.bind(TXMCoreMessages.info_p0P1Deleted, this.getResultType(), this.getSimpleName()));
1415
			}
1416
			
1417
			
1411 1418
			return true;
1412 1419
		}
1413 1420
		catch (Exception e) {
......
2363 2370
				}
2364 2371
				
2365 2372
				// log
2366
				if (!this.getComputingStartMessage().isEmpty() && (this.isVisible() || Level.FINE.intValue() >= Log.getLevel().intValue())) {
2373
				if (!this.getComputingStartMessage().isEmpty() && (this.isVisible() || Log.isLoggingFine())) {
2367 2374
					// console log
2368 2375
					Log.info(this.getComputingStartMessage());
2369 2376
					
......
2436 2443
				this.altered = false;
2437 2444
				Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing of result type " + this.getClass() + " done.");
2438 2445
				
2439
				// Log.info(this.getComputingDoneMessage());
2440
				
2441
				
2442 2446
			}
2443 2447
			
2444 2448
			
......
2449 2453
			) {
2450 2454
				
2451 2455
				if (monitor != null && children.size() > 1) {
2452
					monitor.beginTask("Computing children of " + this, children.size());
2453
					// monitor.subTask("Computing children of " + this);
2456
					monitor.beginTask(TXMCoreMessages.bind(TXMCoreMessages.info_computingChildrenOfP0, this), children.size());
2457
					// monitor.subTask(TXMCoreMessages.bind(TXMCoreMessages.info_computingChildrenOfP0, this));
2454 2458
				}
2455 2459
				
2456 2460
				// set the children as dirty since the result has changed
2457 2461
				for (int i = 0; i < this.children.size(); i++) {
2458
					TXMResult child = this.children.get(i);
2459
					// if (child.mustBeSynchronizedWithParent() || child.hasBeenComputedOnce()) {
2460
					child.setDirty();
2461
					// }
2462
					this.children.get(i).setDirty();
2462 2463
				}
2463 2464
				
2464 2465
				// Children cascade computing (if parent == null then it is the Workspace (Tree root))
......
2492 2493
		
2493 2494
		
2494 2495
		// log
2495
		if (!skipComputing && !this.getComputingDoneMessage().isEmpty() && (this.isVisible() || Level.FINE.intValue() >= Log.getLevel().intValue())) {
2496
		if (!skipComputing && !this.getComputingDoneMessage().isEmpty() && (this.isVisible() || Log.isLoggingFine())) {
2496 2497
			// console log
2497 2498
			Log.info(this.getComputingDoneMessage());
2498 2499
			
tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/InternalViewCoreMessages.java (revision 2452)
23 23
	
24 24
	public static String noStructureInformations;
25 25
	
26
	
27
	public static String info_browsingP0;
28
	
29
	
26 30
	static {
27 31
		Utf8NLS.initializeMessages(BUNDLE_NAME, InternalViewCoreMessages.class);
28 32
	}
tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages_fr.properties (revision 2452)
1
#TXM messages generated by the PluginMessagesManager class
2
#Tue Dec 18 10:24:08 CET 2018
3
internalViewColonFailedToRetrieveStructPropertiesValuesColonP0=** Vue interne \: impossible de récupérer les valeurs de propriétés de structures \: {0}.
4
noStructureInformations=\  Nbr. d'informations de structures
5
RESULT_TYPE=Vue interne
6
structureInformationsColon=\  Informations de structures \:
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 = Vue interne
6

  
7
info_browsingP0 = Navigation dans {0}...
8

  
9
internalViewColonFailedToRetrieveStructPropertiesValuesColonP0 = ** Vue interne : impossible de récupérer les valeurs de propriétés de structures : {0}.
10

  
11
noStructureInformations = \  Nbr. d'informations de structures
12

  
13
structureInformationsColon = \  Informations de structures :
tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages.properties (revision 2452)
1
#TXM messages generated by the PluginMessagesManager class
2
#Tue Dec 18 10:24:08 CET 2018
3
internalViewColonFailedToRetrieveStructPropertiesValuesColonP0=** Internal view\: failed to retrieve structural property values\: {0}.
4
noStructureInformations=\  No. structure informations
5
RESULT_TYPE=Internal View
6
structureInformationsColon=\  Structure informations\: 
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 = Internal View
6

  
7
info_browsingP0 = Browsing {0}...
8

  
9
internalViewColonFailedToRetrieveStructPropertiesValuesColonP0 = ** Internal view: failed to retrieve structural property values: {0}.
10

  
11
noStructureInformations = \  No. structure informations
12

  
13
structureInformationsColon = \  Structure informations: 
tmp/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java (revision 2452)
10 10

  
11 11
import org.apache.commons.lang.StringUtils;
12 12
import org.eclipse.osgi.util.NLS;
13
import org.txm.core.messages.TXMCoreMessages;
13 14
import org.txm.core.preferences.TXMPreferences;
14 15
import org.txm.core.results.Parameter;
15 16
import org.txm.core.results.TXMParameters;
......
24 25
import org.txm.searchengine.cqp.corpus.StructuralUnit;
25 26
import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
26 27
import org.txm.searchengine.cqp.corpus.WordProperty;
28
import org.txm.searchengine.cqp.corpus.query.CQLQuery;
27 29
import org.txm.searchengine.cqp.corpus.query.Match;
28
import org.txm.searchengine.cqp.corpus.query.CQLQuery;
29 30
import org.txm.utils.io.IOUtils;
30 31
import org.txm.utils.logger.Log;
31 32

  
......
38 39
 */
39 40
public class InternalView extends TXMResult {
40 41
	
41
	protected List<Match> matches = new ArrayList<Match>();
42
	protected List<Match> matches = new ArrayList<>();
42 43
	
43 44
	protected int nmatches = 0;
44 45
	
......
159 160
	 * @throws CqiClientException
160 161
	 */
161 162
	protected LinkedHashMap<Property, List<String>> getPageContent(int i) throws CqiClientException {
162
		LinkedHashMap<Property, List<String>> rez = new LinkedHashMap<Property, List<String>>();
163
		LinkedHashMap<Property, List<String>> rez = new LinkedHashMap<>();
163 164
		
164 165
		if (i >= 0 && i < nmatches) {
165 166
			Match m = matches.get(i);
......
216 217
		return true;
217 218
	}
218 219
	
220
	
219 221
	@Override
222
	public String getComputingStartMessage() {
223
		return TXMCoreMessages.bind(InternalViewCoreMessages.info_browsingP0, this.getParent().getSimpleName());
224
	}
225
	
226
	
227
	@Override
220 228
	public void clean() {
221 229
		// nothing to do
222 230
	}
......
237 245
		return getCorpus().getName() + " " + pStructuralUnit.getName() + " " + (pCurrentPage + 1); //$NON-NLS-1$ //$NON-NLS-2$
238 246
	}
239 247
	
240
	@Override
241
	public String getComputingDoneMessage() {
242
		return "";
243
		// return TXMCoreMessages.common_done;
244
	}
245 248
	
246 249
	@Override
247 250
	public String getSimpleName() {
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java (revision 2452)
396 396
	
397 397
	@Override
398 398
	public String getComputingStartMessage() {
399
		return TXMCoreMessages.bind("Création de la partition {0} dans le corpus {1}...", this.getSimpleName(), this.getCorpus().getName());
399
		return TXMCoreMessages.bind(SearchEngineCoreMessages.info_computingTheP0PartitionOfTheP1Corpus, this.getSimpleName(), this.getCorpus().getName());
400 400
	}
401 401
	
402 402
	
403 403
	@Override
404 404
	public String getComputingDoneMessage() {
405
		return TXMCoreMessages.bind(TXMCoreMessages.P0BuiltParts, this.getPartsCount());
405
		return TXMCoreMessages.bind(SearchEngineCoreMessages.info_doneP0Parts, this.getPartsCount());
406 406
	}
407 407
	
408 408
	/**
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/MainCorpus.java (revision 2452)
37 37
import java.util.Map;
38 38
import java.util.Set;
39 39
import java.util.UUID;
40
import java.util.logging.Level;
40 41

  
41 42
import org.eclipse.core.runtime.IProgressMonitor;
42 43
import org.eclipse.osgi.util.NLS;
......
46 47
import org.txm.importer.cwb.PatchCwbRegistry;
47 48
import org.txm.objects.CorpusBuild;
48 49
import org.txm.objects.Project;
50
import org.txm.searchengine.core.messages.SearchEngineCoreMessages;
49 51
import org.txm.searchengine.cqp.AbstractCqiClient;
50 52
import org.txm.searchengine.cqp.CQPSearchEngine;
51 53
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
52 54
import org.txm.searchengine.cqp.clientExceptions.InvalidCqpIdException;
55
import org.txm.searchengine.cqp.corpus.query.CQLQuery;
53 56
import org.txm.searchengine.cqp.corpus.query.Match;
54
import org.txm.searchengine.cqp.corpus.query.CQLQuery;
55 57
import org.txm.searchengine.cqp.serverException.CqiServerError;
56 58
import org.txm.utils.DeleteDir;
57 59
import org.txm.utils.logger.Log;
......
169 171
		return true;
170 172
	}
171 173
	
174
	
172 175
	@Override
176
	public String getComputingStartMessage() {
177
		if (Log.isLoggingFine()) {
178
			return TXMCoreMessages.bind(SearchEngineCoreMessages.info_computingCorpusP0, this.getName());
179
		}
180
		else {
181
			return ""; //$NON-NLS-1$
182
		}
183
	}
184
	
185
	
186
	@Override
187
	public String getComputingDoneMessage() {
188
		if (Log.isLoggingFine()) {
189
			return super.getComputingDoneMessage();
190
		}
191
		else {
192
			return ""; //$NON-NLS-1$
193
		}
194
	}
195
	
196
	
197
	
198
	@Override
173 199
	public void onProjectClose() {
174 200
		try {
175 201
			if (hasBeenComputedOnce && this.pID != null) {
......
325 351
		}
326 352
	}
327 353
	
328
	@Override
329
	public String getComputingDoneMessage() {
330
		if (hasBeenComputedOnce()) {
331
			return getDetails();
332
		}
333
		else {
334
			return "";
335
		}
336
		// return TXMCoreMessages.common_done;
337
	}
338
	
339 354
	/**
340 355
	 * Gets the first position.
341 356
	 *

Formats disponibles : Unified diff