Révision 2590

tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_fr.properties (revision 2590)
15 15
error_matrixIsEmpty=La matrice est vide.
16 16
error_requestedObjectNotFoundInR=L''objet demandé ({0}) n''a pas été trouvé dans l''espace de travail R.
17 17
error_rserveIsAlreadyRunningOnPort=** Rserve est déjà en cours d'exécution sur le port {0}.
18
error_rservePathNotSet=** Le chemin du programme du moteur statistique n'a pas été renseigné et sa recherche n'a pas abouti.
18
error_rservePathNotSet=** Le chemin du programme du moteur statistique n'a pas été renseigné.
19 19
error_unexpectedErrorInRStatisticsEngine=** Erreur inattendue dans le moteur statistique R \: {0}.
20 20
error_youNeedRSoftware=Vous avez besoin du logiciel 'R' et vous avez besoin de configurer ses chemins d'accès via la fenêtre de préférences 'Outils/Préférences'.
21 21
errorWhileRunningRScriptP0ColonP1=** Erreur lors de l''exécution du script R {0} \: {1}.
......
32 32
p0RScriptDoesntExist=** Le fichier de script R {0} n''existe pas.
33 33
runningP0=Exécution de {0}…
34 34
runningTextSelection=Exécution de la sélection de texte… 
35
rserveNotStartedUsingTheP0Path=** Erreur: Rserve n''a pas pu être démarrer avec le chemin {0}.
35
rserveNotStartedUsingTheP0Path=** Erreur: Rserve n''a pas pu être démarré avec le chemin {0}.
36
error_cantExecuteRServe=** Erreur : le fichier programme R indiqué ({0}) n'est pas executable.
37
error_RservePathNotPointingAFile= ** le chemin de R indiqué ({0}) ne pointe pas sur un fichier.
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java (revision 2590)
11 11
 *
12 12
 */
13 13
public class RCoreMessages extends TXMCoreMessages {
14

  
14
	
15 15
	private static final String BUNDLE_NAME = "org.txm.statsengine.r.core.messages.messages"; //$NON-NLS-1$
16 16
	
17 17
	public static String error_cantFindRServeInPath;
18
	
18 19
	public static String error_connectionFailed;
20
	
19 21
	public static String error_errorDuringItemsListExtraction;
22
	
20 23
	public static String error_errorWhileEvaluating;
24
	
21 25
	public static String error_evaluationError;
26
	
22 27
	public static String error_failedToConnectToTheRWorkspace;
28
	
23 29
	public static String error_failedToInitializeFileTransfert;
30
	
24 31
	public static String error_failedToLoadLibrary;
32
	
25 33
	public static String error_failedToRunREG;
34
	
26 35
	public static String error_failedToStartRServe;
36
	
27 37
	public static String error_failedToStartRServeWithCommand;
38
	
28 39
	public static String error_matrixIsEmpty;
40
	
29 41
	public static String error_requestedObjectNotFoundInR;
42
	
30 43
	public static String error_rserveIsAlreadyRunningOnPort;
44
	
31 45
	public static String error_rservePathNotSet;
46
	
32 47
	public static String error_youNeedRSoftware;
48
	
33 49
	public static String info_connectingToRAt;
50
	
34 51
	public static String info_connectingToRAtWithUser;
52
	
35 53
	public static String info_lastSafeEvalExpression;
54
	
36 55
	public static String info_rPathNotSetTryingToFindIt;
56
	
37 57
	public static String info_savingChartToFile;
58
	
38 59
	public static String info_startingRWithCommandLine;
60
	
39 61
	public static String info_startingStatsEngine;
62
	
40 63
	public static String info_statisticsEngineLaunched;
64
	
41 65
	public static String info_tryingToStartRFrom;
66
	
42 67
	public static String info_tryingToStartRWithRPath;
43 68
	
44
	public static String runningP0; 
45
	public static String doneColon; 
46
	public static String runningTextSelection; 
47
	public static String errorWhileRunningRScriptP0ColonP1; 
48
	public static String p0RScriptDoesntExist; 
49

  
69
	public static String runningP0;
70
	
71
	public static String doneColon;
72
	
73
	public static String runningTextSelection;
74
	
75
	public static String errorWhileRunningRScriptP0ColonP1;
76
	
77
	public static String p0RScriptDoesntExist;
78
	
50 79
	public static String error_unexpectedErrorInRStatisticsEngine;
51

  
80
	
52 81
	public static String rserveNotStartedUsingTheP0Path;
53

  
82
	
83
	public static String error_cantExecuteRServe;
84
	
85
	public static String error_RservePathNotPointingAFile;
86
	
54 87
	static {
55 88
		// initialize resource bundle
56 89
		Utf8NLS.initializeMessages(BUNDLE_NAME, RCoreMessages.class);
57 90
	}
58

  
59
	private RCoreMessages() {
60
	}
91
	
92
	private RCoreMessages() {}
61 93
}
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties (revision 2590)
20 20
error_matrixIsEmpty                      = Matrix is empty.
21 21
error_requestedObjectNotFoundInR         = The requested object ({0}) was not found in the R workspace.
22 22
error_rserveIsAlreadyRunningOnPort       = ** Rserve is already running on port {0}.
23
error_rservePathNotSet                   = ** The statistics engine program path is not set and we could not find it.
23
error_rservePathNotSet                   = ** The statistics engine program path is not set.
24 24
error_unexpectedErrorInRStatisticsEngine = ** Unexpected error in R statistics engine: {0}.
25 25
error_youNeedRSoftware                   = You need the 'R' software and you need to configure its access paths via the preferences window 'Tools / Preferences'.
26 26

  
......
42 42
runningP0 = Running {0}…
43 43

  
44 44
runningTextSelection = Running text selection…
45

  
46
error_cantExecuteRServe=** Error : the R program file ({0}) is not executable.
47
error_RservePathNotPointingAFile= ** the R path ({0}) does not indicate a file.
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java (revision 2590)
308 308
		Log.fine(TXMCoreMessages.bind("RWorkspace.initRserve(): checking file existence of {0}...", pathToRExecutable)); //$NON-NLS-1$
309 309
		
310 310
		File execFile = new File(pathToRExecutable);
311
		if (!execFile.exists() || pathToRExecutable == null || pathToRExecutable.length() == 0) {
312
			// isRServerOk = StartRserve.checkLocalRserve(port, debug, rargs, rServeArgs);
313
			// if (!isRServerOk) {
311
		if (pathToRExecutable == null || pathToRExecutable.trim().length() == 0) {
314 312
			throw new RWorkspaceException(RCoreMessages.error_rservePathNotSet);
315
			// }
316 313
		}
314
		else if (!execFile.exists()) {
315
			throw new RWorkspaceException(RCoreMessages.bind(RCoreMessages.error_cantFindRServeInPath, pathToRExecutable));
316
		}
317
		else if (!execFile.isFile()) {
318
			throw new RWorkspaceException(RCoreMessages.bind(RCoreMessages.error_RservePathNotPointingAFile, pathToRExecutable));
319
		}
320
		else if (!execFile.canExecute()) {
321
			throw new RWorkspaceException(RCoreMessages.bind(RCoreMessages.error_cantExecuteRServe, pathToRExecutable));
322
		}
317 323
		else {
318 324
			isRServerOk = StartRserve.launchRserve(pathToRExecutable, port, debug, rargs, rServeArgs);
319 325
			// System.out.println("ap launchRserve");
320 326
			if (!isRServerOk) {
321
				Log.severe(NLS.bind(RCoreMessages.rserveNotStartedUsingTheP0Path, pathToRExecutable));
327
				throw new RWorkspaceException(NLS.bind(RCoreMessages.rserveNotStartedUsingTheP0Path, pathToRExecutable));
322 328
				// isRServerOk = StartRserve.checkLocalRserve(port, debug, rargs, rServeArgs);
323 329
			}
324
			
325
			if (!isRServerOk) {
326
				throw new RWorkspaceException(RCoreMessages.bind(RCoreMessages.error_cantFindRServeInPath, pathToRExecutable));
327
			}
328 330
		}
329 331
		
330 332
		if (isRServerOk) {

Formats disponibles : Unified diff