Révision 1704

tmp/TXMDevPlugins.site/site.xml (revision 1704)
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<site>
3
   <feature url="features/org.txm.ahc.feature_1.0.0.1680.jar" id="org.txm.ahc.feature" version="1.0.0.1680"/>
4
   <feature url="features/org.txm.annotation.feature_1.0.0.1680.jar" id="org.txm.annotation.feature" version="1.0.0.1680"/>
5
   <feature url="features/org.txm.annotation.kr.feature_1.0.0.1680.jar" id="org.txm.annotation.kr.feature" version="1.0.0.1680"/>
6
   <feature url="features/org.txm.annotation.urs.feature_1.0.0.1680.jar" id="org.txm.annotation.urs.feature" version="1.0.0.1680"/>
7
   <feature url="features/org.txm.backtomedia.feature_1.0.0.1680.jar" id="org.txm.backtomedia.feature" version="1.0.0.1680"/>
8
   <feature url="features/org.txm.ca.feature_1.0.0.1680.jar" id="org.txm.ca.feature" version="1.0.0.1680"/>
9
   <feature url="features/org.txm.chartsengine.jfreechart.feature_1.0.0.1680.jar" id="org.txm.chartsengine.jfreechart.feature" version="1.0.0.1680"/>
10
   <feature url="features/org.txm.chartsengine.r.feature_1.0.0.1680.jar" id="org.txm.chartsengine.r.feature" version="1.0.0.1680"/>
11
   <feature url="features/org.txm.concordance.feature_1.0.0.1680.jar" id="org.txm.concordance.feature" version="1.0.0.1680"/>
12
   <feature url="features/org.txm.cooccurrence.feature_1.0.0.1680.jar" id="org.txm.cooccurrence.feature" version="1.0.0.1680"/>
13
   <feature url="features/org.txm.cql2lsa.feature_1.0.0.1680.jar" id="org.txm.cql2lsa.feature" version="1.0.0.1680"/>
14
   <feature url="features/org.txm.dictionary.feature_1.0.0.1680.jar" id="org.txm.dictionary.feature" version="1.0.0.1680"/>
15
   <feature url="features/org.txm.edition.feature_1.0.0.1680.jar" id="org.txm.edition.feature" version="1.0.0.1680"/>
16
   <feature url="features/org.txm.groovy.feature_1.0.0.1680.jar" id="org.txm.groovy.feature" version="1.0.0.1680"/>
17
   <feature url="features/org.txm.index.feature_1.0.0.1680.jar" id="org.txm.index.feature" version="1.0.0.1680"/>
18
   <feature url="features/org.txm.internalview.feature_1.0.0.1680.jar" id="org.txm.internalview.feature" version="1.0.0.1680"/>
19
   <feature url="features/org.txm.lexicaltable.feature_1.0.0.1680.jar" id="org.txm.lexicaltable.feature" version="1.0.0.1680"/>
20
   <feature url="features/org.txm.partition.feature_1.0.0.1680.jar" id="org.txm.partition.feature" version="1.0.0.1680"/>
21
   <feature url="features/org.txm.progression.feature_1.0.0.1680.jar" id="org.txm.progression.feature" version="1.0.0.1680"/>
22
   <feature url="features/org.txm.properties.feature_1.0.0.1680.jar" id="org.txm.properties.feature" version="1.0.0.1680"/>
23
   <feature url="features/org.txm.referencer.feature_1.0.0.1680.jar" id="org.txm.referencer.feature" version="1.0.0.1680"/>
24
   <feature url="features/org.txm.searchengine.cqp.feature_1.0.0.1680.jar" id="org.txm.searchengine.cqp.feature" version="1.0.0.1680"/>
25
   <feature url="features/org.txm.specificities.feature_1.0.0.1680.jar" id="org.txm.specificities.feature" version="1.0.0.1680"/>
26
   <feature url="features/org.txm.statsengine.r.feature_1.0.0.1680.jar" id="org.txm.statsengine.r.feature" version="1.0.0.1680"/>
27
   <feature url="features/org.txm.svn.feature_1.0.0.1680.jar" id="org.txm.svn.feature" version="1.0.0.1680"/>
28
   <feature url="features/org.txm.textsbalance.feature_1.0.0.1680.jar" id="org.txm.textsbalance.feature" version="1.0.0.1680"/>
29
   <feature url="features/org.txm.tigersearch.feature_1.0.0.1680.jar" id="org.txm.tigersearch.feature" version="1.0.0.1680"/>
30
   <feature url="features/org.txm.translate.feature_1.0.0.1680.jar" id="org.txm.translate.feature" version="1.0.0.1680"/>
31
   <feature url="features/org.txm.treetagger.binaries.feature_1.0.0.1680.jar" id="org.txm.treetagger.binaries.feature" version="1.0.0.1680"/>
32
   <feature url="features/org.txm.treetagger.feature_1.0.0.1680.jar" id="org.txm.treetagger.feature" version="1.0.0.1680"/>
33
   <feature url="features/org.txm.treetagger.models.feature_1.0.0.1680.jar" id="org.txm.treetagger.models.feature" version="1.0.0.1680"/>
34
   <feature url="features/org.txm.wordcloud.feature_1.0.0.1680.jar" id="org.txm.wordcloud.feature" version="1.0.0.1680"/>
3 35
</site>
4 36

  
tmp/org.txm.core/.settings/org.eclipse.core.resources.prefs (revision 1704)
1 1
eclipse.preferences.version=1
2
encoding//src/java/org/txm/core/messages/messages.properties=UTF-8
2 3
encoding//src/java/org/txm/core/messages/messages_fr.properties=UTF-8
3 4
encoding//src/java/org/txm/core/messages/messages_ru.properties=UTF-8
4 5
encoding/<project>=UTF-8
tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 1704)
12 12

  
13 13
catalogFileNotFoundP0 = ** Catalog file {0} not found.
14 14

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

  
17 17
common_absoluteFrequency         = Absolute Frequency
18 18
common_cancel                    = Cancel
......
53 53

  
54 54
couldntReadCorpusColon = ** Can not read the corpus data: 
55 55

  
56
dataDirectoryIsMissingColonP0 = The 'data'' folder {0} is missing
56
dataDirectoryIsMissingColonP0 = The ''data'' folder {0} is missing
57 57

  
58 58
doesNotExists = \ does not exist.
59 59

  
......
111 111

  
112 112
failedToExec = ** Failed to execute {0}: {1}.
113 113

  
114
failedToExecTaskkillIMCqpserverexeFColon = ** Failed to execute 'taskkill /IM cqpserver.exe /F': {0}.
114
failedToExecTaskkillIMCqpserverexeFColon = ** Failed to execute ''taskkill /IM cqpserver.exe /F'': {0}.
115 115

  
116
failedToExecTskillCqpserverexeColon = ** Failed to execute 'tskill cqpserver.exe': {0}.
116
failedToExecTskillCqpserverexeColon = ** Failed to execute ''tskill cqpserver.exe'': {0}.
117 117

  
118 118
failedToGetLastCQPErrorColon = ** Failed to retrieve last CQP error: 
119 119

  
......
129 129

  
130 130
file = ** File 
131 131

  
132
fillImportxmlWithColon = Fill ‘'import.xml' file with: 
132
fillImportxmlWithColon = Fill ''import.xml'' file with: 
133 133

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

  
......
139 139

  
140 140
focusIsEmptyOrNull = Focus is empty or null
141 141

  
142
hasNoBase = has no 'root corpus'
142
hasNoBase = has no ''root corpus'
143 143

  
144
htmlDirectoryIsMissingColonP0 = The 'HTML' folder {0} is missing
144
htmlDirectoryIsMissingColonP0 = The ''HTML'' folder {0} is missing
145 145

  
146 146
iOColon = IO: 
147 147

  
......
151 151

  
152 152
initializationOfGroovyImportScriptRunner = Initialization of GroovyImportScriptRunner
153 153

  
154
isMissing = '{0}'' can not be found.
154
isMissing = ''{0}'' can not be found.
155 155

  
156 156
isNotAValidCQPIDForACorpusItMustBeInUppercaseCharacters = \ is not a valid CQP identifier for a corpus. It must be in uppercase characters.
157 157

  
158 158
isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters = \ is not a valid CQP identifier for a sub-corpus. It must be in uppercase followed by lowercase characters.
159 159

  
160
killPsAuxPipeGrepCqpserverPipeAwkP = kill `ps aux | grep cqpserver | awk '/-P 
161

  
162 160
languageColon = , Language: 
163 161

  
164
loadingExtensions = Loading extensions
162
loadingExtensions = Loading extensions...
165 163

  
166 164
loadingWorkspaceFromFileColonP0 = Loading workspace from the {0} file
167 165

  
......
183 181

  
184 182
pARAMSColonP0 = Parameters: {0}
185 183

  
186
parentDirectoryP0NotFound = Parent folder ‘'{0}' not found.
184
parentDirectoryP0NotFound = Parent folder ''{0}'' not found.
187 185

  
188
print2 = / {print $2}'`
189 186

  
190
processing = Processing
187
processing = Processing...
191 188

  
192
processingTextColonP0 = Processing file ‘'{0}'...
189
processingTextColonP0 = Processing file ''{0}''...
193 190

  
194 191
queryOnP0ColonP1InfP2 = Query on {0} : {1} <- {2}
195 192

  
......
197 194

  
198 195
queryingPartitionP0 = Querying partition {0}
199 196

  
200
readCorpusInfosFromOldImportxmlFileColonP0 = Reading the corpus properties from the ‘'import.xml' file: {0}
197
readCorpusInfosFromOldImportxmlFileColonP0 = Reading the corpus properties from the ''import.xml'' file: {0}
201 198

  
202 199
readError = ** Read error
203 200

  
204
registryFileIsMissingColonP0 = The ‘''registry' file {0} is missing
201
registryFileIsMissingColonP0 = The ''registry'' file {0} is missing
205 202

  
206 203
reorganizingFilesOfP0 = reorganizing files of {0}
207 204

  
......
223 220

  
224 221
theP0PartFocusDoesntBelongToPartitionP1 = There is no {0} part in the {1} partition.
225 222

  
226
txmDirectoryIsMissingColonP0 = The 'txm'' folder {0} is missing
223
txmDirectoryIsMissingColonP0 = The ''txm'' folder {0} is missing
227 224

  
228 225
unknownPartitionName = ** Unknown partition name.
229 226

  
tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 1704)
14 14
// FIXME: SJ: this class should be split in one containing only the core messages and another that contains the utils methods bind() and UTF-8 initializing
15 15
// The new manager class should contain other helping method eg. some based on MessageFormat to manage plurals, etc.
16 16
public class TXMCoreMessages extends NLS {
17

  
18 17
	
19 18
	private static final String BUNDLE_NAME = "org.txm.core.messages.messages"; //$NON-NLS-1$
20 19
	
21

  
22 20
	public static String common_cols;
23 21
	public static String common_delete;
24 22
	public static String common_description;
......
150 148
	public static String failedToExecTaskkillIMCqpserverexeFColon; 
151 149
	public static String orTheEngineWasNotStartedWithTheCommandLineColon; 
152 150
	public static String failedToExecTskillCqpserverexeColon; 
153
	public static String killPsAuxPipeGrepCqpserverPipeAwkP; 
154
	public static String print2; 
155 151
	public static String failedToExec; 
156 152
	public static String connectedToCQP; 
157 153
	public static String errorDuringWorkspaceInitializationColonP0; 
tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties (revision 1704)
157 157

  
158 158
isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters = \ n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
159 159

  
160
killPsAuxPipeGrepCqpserverPipeAwkP = kill `ps aux | grep cqpserver | awk '/-P 
161

  
162 160
languageColon = , Langue : 
163 161

  
164 162
loadingExtensions = Chargement des extensions...
......
185 183

  
186 184
parentDirectoryP0NotFound = Dossier parent ''{0}'' introuvable.
187 185

  
188
print2 = / {print $2}'`
189 186

  
190 187
processing = Traitement en cours…
191 188

  
......
221 218

  
222 219
theFocusIsEmptyOrNull = ** Le focus est vide ou nul.
223 220

  
224
theP0PartFocusDoesntBelongToPartitionP1 = Il n'y a pas de partie {0} dans la partition {1}.
221
theP0PartFocusDoesntBelongToPartitionP1 = Il n''y a pas de partie {0} dans la partition {1}.
225 222

  
226 223
txmDirectoryIsMissingColonP0 = Le dossier '''txm'' {0} est manquant
227 224

  
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java (revision 1704)
361 361
	 * kill cqpserver process.
362 362
	 */
363 363
	private static void killSearchEngine() {
364
		if (!CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_SERVER_IS_REMOTE))
364
		if (!CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_SERVER_IS_REMOTE) && cqiServer instanceof MemCqiServer) {
365 365
			// Windows OS
366 366
			if (OSDetector.isFamilyWindows()) {
367 367
				try {
......
394 394
			}
395 395
		// Mac, Linux
396 396
			else {
397
				String cmd = TXMCoreMessages.killPsAuxPipeGrepCqpserverPipeAwkP + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT) + TXMCoreMessages.print2;
397
				String cmd = "kill `ps aux | grep cqpserver | awk '/-P "+CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)+"/ {print $2}'`"; // //$NON-NLS-1$ //$NON-NLS-2$
398 398
				try {
399 399
					//Process p = Runtime.getRuntime().exec("killall -9 cqpserver"); //$NON-NLS-1$
400 400
					// System.out.println("kill `ps aux | grep cqpserver | awk '/-P "
......
418 418
					org.txm.utils.logger.Log.printStackTrace(e);
419 419
				}
420 420
			}
421
		}
421 422
	}
422 423

  
423 424
	/**
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiClient.java (revision 1704)
191 191

  
192 192
	@Override
193 193
	public int[] alg2Cpos(String arg0, int arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
194
		if (arg0 == null) {
195
			throw new CqiServerError("alg2Cpos called with NULL parameter.");
196
		}
194 197
		int[] rez = server.alg2Cpos(arg0, arg1);
195 198
		if (rez == null) {
196 199
			throwExceptionFromCqi(server.getErrorCode());
......
200 203

  
201 204
	@Override
202 205
	public int attributeSize(String arg0) throws IOException, UnexpectedAnswerException, CqiServerError {
206
		if (arg0 == null) {
207
			throw new CqiServerError("attributeSize called with NULL parameter.");
208
		}
203 209
		Integer ret = server.attributeSize(arg0);
204 210
		if (ret == null || ret == -1) {
205 211
			throwExceptionFromCqi(server.getErrorCode());
......
213 219

  
214 220
	@Override
215 221
	public String[] corpusAlignementAttributes(String arg0) throws UnexpectedAnswerException, IOException, CqiServerError {
222
		if (arg0 == null) {
223
			throw new CqiServerError("corpusAlignementAttributes called with NULL parameter.");
224
		}
216 225
		String[] rez = server.corpusAlignementAttributes(arg0);
217 226
		if (rez == null) {
218 227
			throwExceptionFromCqi(server.getErrorCode());
......
222 231

  
223 232
	@Override
224 233
	public String corpusCharset(String arg0) throws UnexpectedAnswerException, IOException, CqiServerError {
234
		if (arg0 == null) {
235
			throw new CqiServerError("corpusCharset called with NULL parameter.");
236
		}
225 237
		String rez = server.corpusCharset(arg0);
226 238
		if (rez == null) {
227 239
			throwExceptionFromCqi(server.getErrorCode());
......
231 243

  
232 244
	@Override
233 245
	public String corpusFullName(String arg0) throws UnexpectedAnswerException, IOException, CqiServerError {
246
		if (arg0 == null) {
247
			throw new CqiServerError("corpusFullName called with NULL parameter.");
248
		}
234 249
		String rez = server.corpusFullName(arg0);
235 250
		if (rez == null) {
236 251
			throwExceptionFromCqi(server.getErrorCode());
......
251 266

  
252 267
	@Override
253 268
	public String[] corpusPositionalAttributes(String arg0) throws UnexpectedAnswerException, IOException, CqiServerError {
269
		if (arg0 == null) {
270
			throw new CqiServerError("corpusPositionalAttributes called with NULL parameter.");
271
		}
254 272
		String[] rez = server.corpusPositionalAttributes(arg0);
255 273
		if (rez == null) {
256 274
			throwExceptionFromCqi(server.getErrorCode());
......
260 278

  
261 279
	@Override
262 280
	public String[] corpusProperties(String arg0) throws UnexpectedAnswerException, IOException, CqiServerError {
281
		if (arg0 == null) {
282
			throw new CqiServerError("corpusProperties called with NULL parameter.");
283
		}
263 284
		String[] rez = server.corpusProperties(arg0);
264 285
		if (rez == null) {
265 286
			throwExceptionFromCqi(server.getErrorCode());
......
269 290

  
270 291
	@Override
271 292
	public boolean corpusStructuralAttributeHasValues(String arg0) throws UnexpectedAnswerException, IOException, CqiServerError {
293
		if (arg0 == null) {
294
			throw new CqiServerError("corpusStructuralAttributeHasValues called with NULL parameter.");
295
		}
272 296
		Boolean rez = server.corpusStructuralAttributeHasValues(arg0);
273 297
		if (rez == null || !rez) {
274 298
			throwExceptionFromCqi(server.getErrorCode());
......
278 302

  
279 303
	@Override
280 304
	public String[] corpusStructuralAttributes(String arg0) throws UnexpectedAnswerException, IOException, CqiServerError {
305
		if (arg0 == null) {
306
			throw new CqiServerError("corpusStructuralAttributes called with NULL parameter.");
307
		}
281 308
		String[] rez = server.corpusStructuralAttributes(arg0);
282 309
		if (rez == null) {
283 310
			throwExceptionFromCqi(server.getErrorCode());
......
287 314

  
288 315
	@Override
289 316
	public int[] cpos2Alg(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
317
		if (arg0 == null || arg1 == null) {
318
			throw new CqiServerError("cpos2Alg called with NULL parameter.");
319
		}
290 320
		int[] rez = server.cpos2Alg(arg0, arg1);
291 321
		if (rez == null) {
292 322
			throwExceptionFromCqi(server.getErrorCode());
......
296 326

  
297 327
	@Override
298 328
	public int[] cpos2Id(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
329
		if (arg0 == null || arg1 == null) {
330
			throw new CqiServerError("cpos2Id called with NULL parameter.");
331
		}
299 332
		int[] rez = server.cpos2Id(arg0, arg1);
300 333
		if (rez == null) {
301 334
			throwExceptionFromCqi(server.getErrorCode());
......
305 338

  
306 339
	@Override
307 340
	public int[] cpos2LBound(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
341
		if (arg0 == null || arg1 == null) {
342
			throw new CqiServerError("cpos2LBound called with NULL parameter.");
343
		}
308 344
		int[] rez = server.cpos2LBound(arg0, arg1);
309 345
		if (rez == null) {
310 346
			throwExceptionFromCqi(server.getErrorCode());
......
314 350

  
315 351
	@Override
316 352
	public int[] cpos2RBound(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
353
		if (arg0 == null || arg1 == null) {
354
			throw new CqiServerError("cpos2RBound called with NULL parameter.");
355
		}
317 356
		int[] rez = server.cpos2RBound(arg0, arg1);
318 357
		if (rez == null) {
319 358
			throwExceptionFromCqi(server.getErrorCode());
......
323 362

  
324 363
	@Override
325 364
	public String[] cpos2Str(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
365
		if (arg0 == null || arg1 == null) {
366
			throw new CqiServerError("cpos2Str called with NULL parameter.");
367
		}
326 368
		String[] rez = server.cpos2Str(arg0, arg1);
327 369
		if (rez == null) {
328 370
			throwExceptionFromCqi(server.getErrorCode());
......
332 374

  
333 375
	@Override
334 376
	public int[] cpos2Struc(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
377
		if (arg0 == null || arg1 == null) {
378
			throw new CqiServerError("cpos2Struc called with NULL parameter.");
379
		}
335 380
		int[] rez = server.cpos2Struc(arg0, arg1);
336 381
		if (rez == null) {
337 382
			throwExceptionFromCqi(server.getErrorCode());
......
342 387
	@Override
343 388
	public void cqpQuery(String arg0, String arg1, String arg2)
344 389
			throws IOException, UnexpectedAnswerException, CqiServerError {
390
		if (arg0 == null || arg1 == null || arg2 == null) {
391
			throw new CqiServerError("cqpQuery called with NULL parameter.");
392
		}
345 393
		Boolean ret = server.cqpQuery(arg0, arg1, arg2);
346 394
		//System.out.println("CQPSERVER return: "+ret);
347 395
		if(ret == null || !ret) {
......
353 401

  
354 402
	public void query(String arg0)
355 403
			throws IOException, UnexpectedAnswerException, CqiServerError {
404
		if (arg0 == null) {
405
			throw new CqiServerError("query called with NULL parameter.");
406
		}
356 407
		Boolean ret = server.query(arg0);
357 408
		if(ret == null || !ret) {
358 409
			System.out.println(CQPSearchEngineCoreMessages.queryError);
......
375 426
	@Override
376 427
	public void dropCorpus(String arg0) throws Exception {
377 428
		Log.finest(NLS.bind("Droping corpus {0}...", arg0)); //$NON-NLS-1$
378
		
429
		if (arg0 == null) {
430
			throw new Exception("dropCorpus called with NULL parameter.");
431
		}
379 432
		Boolean ret = server.dropCorpus(arg0);
380 433
		if(ret == null || !ret) {
381 434
			throwExceptionFromCqi(server.getErrorCode());
382 435
		}
383 436
	}
384

  
437
 
385 438
	@Override
386 439
	public void dropSubCorpus(String arg0) throws IOException, UnexpectedAnswerException, CqiServerError {
387 440
		Log.finest(NLS.bind("Droping subcorpus {0}...", arg0)); //$NON-NLS-1$
388

  
441
		if (arg0 == null) {
442
			throw new CqiServerError("dropSubCorpus called with NULL parameter.");
443
		}
389 444
		Boolean ret = server.dropSubCorpus(arg0);
390 445
		if (ret == null || !ret) {
391 446
			throwExceptionFromCqi("Fail to drop subcorpus "+arg0+": ", server.getErrorCode());
......
395 450
	@Override
396 451
	public int[] dumpSubCorpus(String arg0, byte arg1, int arg2, int arg3)
397 452
			throws IOException, UnexpectedAnswerException, CqiServerError {
453
		if (arg0 == null) {
454
			throw new CqiServerError("dumpSubCorpus called with NULL parameter.");
455
		}
398 456
		int[] rez = server.dumpSubCorpus(arg0, arg1, arg2, arg3);
399 457
		if (rez == null) {
400 458
			throwExceptionFromCqi(server.getErrorCode());
......
405 463
	@Override
406 464
	public int[][] fdist1(String arg0, int arg1, byte arg2, String arg3)
407 465
			throws IOException, UnexpectedAnswerException, CqiServerError {
466
		if (arg0 == null || arg3 == null) {
467
			throw new CqiServerError("fdist1 called with NULL parameter.");
468
		}
408 469
		int[] all = nfdist1(arg0, arg1, arg2, arg3);
409
		if (all == null) {
410
			return new int[0][0];
411
		}
470

  
412 471
		int[][] freqs = new int[all.length / 2][2];
413 472
		int c = 0;
414 473
		for (int i = 0 ; i < freqs.length ;i++) {
......
421 480

  
422 481
	public int[] nfdist1(String arg0, int arg1, byte arg2, String arg3)
423 482
			throws IOException, UnexpectedAnswerException, CqiServerError {
483
		if (arg0 == null || arg3 == null) {
484
			throw new CqiServerError("nfdist1 called with NULL parameter.");
485
		}
424 486
		int[] rez = server.nfdist1(arg0, arg1, arg2, arg3);
425 487
		if (rez == null) {
426 488
			throwExceptionFromCqi(server.getErrorCode());
......
432 494
	public int[][] fdist2(String arg0, int arg1, byte arg2, String arg3,
433 495
			byte arg4, String arg5) throws IOException,
434 496
			UnexpectedAnswerException, CqiServerError {
497
		if (arg0 == null || arg3 == null || arg5 == null) {
498
			throw new CqiServerError("fdist2 called with NULL parameter.");
499
		}
435 500
		int[] all = nfdist2(arg0, arg1, arg2, arg3, arg4, arg5);
436 501
		if (all == null) {
437 502
			return new int[0][0];
......
448 513

  
449 514
	public int[] nfdist2(String arg0, int arg1, byte arg2, String arg3,
450 515
			byte arg4, String arg5) throws IOException, UnexpectedAnswerException, CqiServerError {
516
		if (arg0 == null || arg3 == null || arg5 == null) {
517
			throw new CqiServerError("nfdist2 called with NULL parameter.");
518
		}
451 519
		int[] rez = server.nfdist2(arg0, arg1, arg2, arg3, arg4, arg5);
452 520
		if (rez == null) {
453 521
			throwExceptionFromCqi(server.getErrorCode());
......
475 543

  
476 544
	@Override
477 545
	public int[] id2Cpos(String arg0, int arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
546
		if (arg0 == null) {
547
			throw new CqiServerError("id2Cpos called with NULL parameter.");
548
		}
478 549
		int[] rez = server.id2Cpos(arg0, arg1);
479 550
		if (rez == null) {
480 551
			throwExceptionFromCqi(server.getErrorCode());
......
484 555

  
485 556
	@Override
486 557
	public int[] id2Freq(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
558
		if (arg0 == null || arg1 == null) {
559
			throw new CqiServerError("id2Freq called with NULL parameter.");
560
		}
487 561
		int[] rez = server.id2Freq(arg0, arg1);
488 562
		if (rez == null) {
489 563
			throwExceptionFromCqi(server.getErrorCode());
......
493 567

  
494 568
	@Override
495 569
	public String[] id2Str(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
570
		if (arg0 == null || arg1 == null) {
571
			throw new CqiServerError("id2Str called with NULL parameter.");
572
		}
496 573
		String[] rez = server.id2Str(arg0, arg1);
497 574
		if (rez == null) {
498 575
			throwExceptionFromCqi(server.getErrorCode());
......
502 579

  
503 580
	@Override
504 581
	public int[] idList2Cpos(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
582
		if (arg0 == null || arg1 == null) {
583
			throw new CqiServerError("idList2Cpos called with NULL parameter.");
584
		}
505 585
		int[] rez = server.idList2Cpos(arg0, arg1);
506 586
		if (rez == null) {
507 587
			throwExceptionFromCqi(server.getErrorCode());
......
511 591

  
512 592
	@Override
513 593
	public int lexiconSize(String arg0) throws IOException, UnexpectedAnswerException, CqiServerError {
594
		if (arg0 == null) {
595
			throw new CqiServerError("lexiconSize called with NULL parameter.");
596
		}
514 597
		Integer rez = server.lexiconSize(arg0);
515 598
		if (rez == null) {
516 599
			throwExceptionFromCqi(server.getErrorCode());
......
529 612

  
530 613
	@Override
531 614
	public String[] listSubcorpora(String arg0) throws UnexpectedAnswerException, IOException, CqiServerError {
615
		if (arg0 == null) {
616
			throw new CqiServerError("listSubcorpora called with NULL parameter.");
617
		}
532 618
		String[] rez = server.listSubcorpora(arg0);
533 619
		if (rez == null) {
534 620
			throwExceptionFromCqi(server.getErrorCode());
......
541 627

  
542 628
	@Override
543 629
	public int[] regex2Id(String arg0, String arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
630
		if (arg0 == null || arg1 == null) {
631
			throw new CqiServerError("regex2Id called with NULL parameter.");
632
		}
544 633
		int[] rez = server.regex2Id(arg0, arg1);
545 634
		if (rez == null) {
546 635
			throwExceptionFromCqi(server.getErrorCode());
......
550 639

  
551 640
	@Override
552 641
	public int[] str2Id(String arg0, String[] arg1) throws IOException, UnexpectedAnswerException, CqiServerError {
642
		if (arg0 == null || arg1 == null) {
643
			throw new CqiServerError("str2Id called with NULL parameter.");
644
		}
553 645
		int[] rez = server.str2Id(arg0, arg1);
554 646
		if (rez == null) {
555 647
			//System.out.println("error: "+server.getErrorCode());
......
560 652

  
561 653
	@Override
562 654
	public int[] struc2Cpos(String arg0, int arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
655
		if (arg0 == null) {
656
			throw new CqiServerError("struc2Cpos called with NULL parameter.");
657
		}
563 658
		int[] rez = server.struc2Cpos(arg0, arg1);
564 659
		if (rez == null) {
565 660
			throwExceptionFromCqi(server.getErrorCode());
......
569 664

  
570 665
	@Override
571 666
	public String[] struc2Str(String arg0, int[] arg1) throws UnexpectedAnswerException, IOException, CqiServerError {
667
		if (arg0 == null || arg1 == null) {
668
			throw new CqiServerError("struc2Str called with NULL parameter.");
669
		}
572 670
		String[] rez = server.struc2Str(arg0, arg1);
573 671
		if (rez == null) {
574 672
			throwExceptionFromCqi(server.getErrorCode());
......
587 685

  
588 686
	@Override
589 687
	public int subCorpusSize(String arg0) throws IOException, UnexpectedAnswerException, CqiServerError {
688
		if (arg0 == null) {
689
			throw new CqiServerError("subCorpusSize called with NULL parameter.");
690
		}
590 691
		Integer rez = server.subCorpusSize(arg0);
591 692
		if (rez == null) {
592 693
			throwExceptionFromCqi(server.getErrorCode());
......
596 697

  
597 698
	@Override
598 699
	public boolean load_a_system_corpus(String regfilepath, String entry) throws IOException, UnexpectedAnswerException, CqiServerError {
700
		if (regfilepath == null) {
701
			throw new CqiServerError("load_a_system_corpus called with NULL regfilepath parameter.");
702
		}
703
		if (entry == null) {
704
			throw new CqiServerError("load_a_system_corpus called with NULL entry parameter.");
705
		}
599 706
		return server.load_a_system_corpus(regfilepath, entry);
600 707
	}
601 708
}
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java (revision 1704)
490 490
		annotationTypesCombo.getCombo().setLayoutData(gdata);
491 491
		annotationTypesCombo.setInput(typesList);
492 492
		annotationTypesCombo.getCombo().select(0);
493
		for (int i = 0 ; i < typesList.size(); i++) {
494
			String name = typesList.get(i).getName();
495
			if ("word".equals(name)) {
496
				annotations.setViewAnnotation(typesList.get(i));
497
				annotationColumn.setText(name);
498
			}
499
		}
493
		annotations.setViewAnnotation(typesList.get(0));
494
		annotationColumn.setText(typesList.get(0).getName());
495
//		for (int i = 0 ; i < typesList.size(); i++) {
496
//			String name = typesList.get(i).getName();
497
//			if ("word".equals(name)) {
498
//				annotations.setViewAnnotation(typesList.get(i));
499
//				annotationColumn.setText(name);
500
//			}
501
//		}
500 502

  
501 503
		annotationTypesCombo.addSelectionChangedListener(new ISelectionChangedListener() {
502 504
			@Override
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editor/AnnotationExtension.java (revision 1704)
17 17
import org.eclipse.swt.layout.GridLayout;
18 18
import org.eclipse.swt.widgets.Group;
19 19
import org.eclipse.swt.widgets.ToolItem;
20
import org.txm.annotation.rcp.messages.AnnotationUIMessages;
20 21
import org.txm.concordance.core.functions.Concordance;
21 22
import org.txm.core.results.TXMResult;
22 23
import org.txm.objects.Text;
......
121 122

  
122 123
		defaultListener = listeners.get(0);
123 124
		String defaultMode = modes.get(0);
124
		controlArea = editor.getTopToolbar().installAlternativesGroup(GROUP_NAME, defaultMode,
125
		controlArea = editor.getTopToolbar().installAlternativesGroup(GROUP_NAME, AnnotationUIMessages.annotateWordProperty,
125 126
				"platform:/plugin/org.txm.rcp/icons/functions/pencil_open.png", 
126 127
				"platform:/plugin/org.txm.rcp/icons/functions/pencil_close.png", false, 
127 128
				openCloseSelectionListener, modes, listeners);
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_fr.properties (revision 1704)
1 1
#TXM messages generated by the PluginMessagesManager class
2 2
#Tue Dec 18 10:24:08 CET 2018
3

  
4
annotateWordProperty=Annoter la propri?t? "word" des mots
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java (revision 1704)
14 14
public class AnnotationUIMessages extends NLS {
15 15

  
16 16
	private static final String BUNDLE_NAME = "org.txm.annotation.rcp.messages.messages"; //$NON-NLS-1$
17
	public static String annotateWordProperty;
17 18
	
18 19
	static {
19 20
		// initialize resource bundle
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties (revision 1704)
1 1
#TXM messages generated by the PluginMessagesManager class
2 2
#Tue Dec 18 10:24:08 CET 2018
3
annotateWordProperty=Annotate the "word" property

Formats disponibles : Unified diff