Révision 1373

tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java (revision 1373)
17 17
import org.rosuda.REngine.RList;
18 18
import org.txm.Toolbox;
19 19
import org.txm.core.engines.EngineType;
20
import org.txm.core.preferences.TBXPreferences;
21
import org.txm.core.preferences.TXMPreferences;
20
import org.txm.core.messages.TXMCoreMessages;
22 21
import org.txm.rcp.handlers.BaseAbstractHandler;
23 22
import org.txm.statsengine.r.core.RWorkspace;
24 23
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
......
97 96
				rw = RWorkspace.getRWorkspaceInstance();
98 97
			} catch (RWorkspaceException e) {
99 98
				Log.printStackTrace(e);
100
				System.out.println(RUIMessages.anErrorOccuredWhileGettingRWorkspaceInsanceColon+e);
99
				System.out.println(TXMCoreMessages.bind(RUIMessages.anErrorOccuredWhileGettingRWorkspaceInsanceColon, e));
101 100
				return false;
102 101
			}
103 102
			for (String p : packages.keySet()) {
......
107 106
					rw.eval("library(\""+p+"\")"); //$NON-NLS-1$ //$NON-NLS-2$
108 107
				} catch (Exception e) {
109 108
					Log.printStackTrace(e);
110
					Log.severe(p+" package not installed. Error="+e); //$NON-NLS-1$
109
					Log.severe(TXMCoreMessages.bind("{0} package not installed. Error={1}.", p, e));
111 110
					ret = false;
112 111
				}
113 112
				if (ret) { // check the version and install if possible
......
116 115
						ret = updateIfNecessary(rw, p, currentVersion);				
117 116
					} catch (Exception e) {
118 117
						Log.printStackTrace(e);
119
						System.out.println("Error while testing package: "+e); //$NON-NLS-1$
118
						System.out.println(TXMCoreMessages.bind("Error while testing package: {0}.", e));
120 119
						ret = false;
121 120
					}
122 121
				} else { // package is not present, install it
123 122
					try {
124
						System.out.println(RUIMessages.the+p+RUIMessages.packageIsNotInstalledTryingToInstallItNow);
123
						System.out.println(TXMCoreMessages.bind("The '{0}' package is not installed. Trying to install it now...", p));
124
						
125 125
						try {rw.eval("detach(\"package:"+p+"\", character.only = TRUE)");} catch(Exception tmpE){} // unload package to be able to reinstall it //$NON-NLS-1$ //$NON-NLS-2$
126 126
						
127 127
						rw.eval("install.packages(\""+p+"\", dependencies=TRUE, method=\""+method+"\", repos=\"http://cran.rstudio.com\");"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
128 128
						
129 129
						try {
130 130
							rw.eval("library(\""+p+"\")"); //$NON-NLS-1$ //$NON-NLS-2$
131
							System.out.println(RUIMessages.doneColon+p+RUIMessages.installedSuccessfully);
131
							System.out.println(TXMCoreMessages.bind(RUIMessages.installedSuccessfully, p));
132 132
						} catch (Exception e) {
133 133
							Log.printStackTrace(e);
134
							System.out.println(RUIMessages.the+p+RUIMessages.packageWasNotInstalledPleaseInstallItManuallyColonRunRAndExecuteInstallpackages+p+RUIMessages.CheckRPackages_23);
134
							System.out.println(TXMCoreMessages.bind("The '{0}' package was not installed. Please install it manually:\n * Run R\n * and execute 'install.packages(\"{1}\"')", p, p));
135 135
							ret = false;
136 136
						}
137 137
					} catch (Exception e) {
138 138
						Log.printStackTrace(e);
139
						System.out.println(RUIMessages.errorWhileInstallingPackageColon+e);
139
						System.out.println(TXMCoreMessages.bind(RUIMessages.errorWhileInstallingPackageColon, e));
140 140
						ret = false;
141 141
					}
142 142
				}
......
150 150
			}
151 151
			ret = false;
152 152
		}
153
		if (ret == true) System.out.println(" OK"); //$NON-NLS-1$
153
		if (ret == true) {
154
			System.out.println(TXMCoreMessages.common_ok);
155
		}
154 156
		return ret;
155 157
	}
156 158
	
......
178 180
					REXPInteger rExpInt = (REXPInteger)elem;
179 181
					return buildVersion(rExpInt);
180 182
				} else {
181
					System.out.println(RUIMessages.eRRORColonRlistFirstElementIsNotREXPIntegerColon+elem);
183
					System.out.println(TXMCoreMessages.bind(RUIMessages.eRRORColonRlistFirstElementIsNotREXPIntegerColon, elem));
182 184
				}
183 185
			} else {
184
				System.out.println(RUIMessages.eRRORColonREvalListSizeIs0Colon+rList);
186
				System.out.println(TXMCoreMessages.bind(RUIMessages.eRRORColonREvalListSizeIs0Colon, rList));
185 187
			}
186 188
		} else {
187
			System.out.println(RUIMessages.eRRORColonREvalIsNotAListColon+rRez);
189
			System.out.println(TXMCoreMessages.bind(RUIMessages.eRRORColonREvalIsNotAListColon, rRez));
188 190
		}	
189 191
		return ""; //$NON-NLS-1$
190 192
	}
......
204 206
		//System.out.println("comp "+(packages.get(p))+" to "+(v));
205 207
		//System.out.println(packages.get(p).compareTo(v));
206 208
		if (packages.get(p).compareTo(currentVersion) > 0) {
207
			System.out.println(RUIMessages.updatingThe+p+RUIMessages.CheckRPackages_36+currentVersion+RUIMessages.rPackageUpToVersion+packages.get(p));
209
			System.out.println(TXMCoreMessages.bind("Updating the '{0}' ({1}) R package up to version {2}...", p, currentVersion, packages.get(p)));
208 210
			
209 211
			try {rw.eval("detach(\"package:"+p+"\", character.only = TRUE)");} catch(Exception tmpE){} // unload package to be able to reinstall it //$NON-NLS-1$ //$NON-NLS-2$
210 212
			
......
215 217
			try {rw.eval("library(\""+p+"\")");} catch(Exception tmpE){} // reload it //$NON-NLS-1$ //$NON-NLS-2$
216 218
			String newVersion = getVersion(rw, p);
217 219
			if (!newVersion.equals(packages.get(p))) {
218
				System.out.println(RUIMessages.updateOf+p+RUIMessages.failedCurrentVersionIsStill+newVersion+RUIMessages.warningColonWindowsUsersNeedToRestartTXM);
220
				System.out.println(TXMCoreMessages.bind("Update of '{0}' failed (current version is still {1}). Warning: Windows users need to restart TXM.", p, newVersion));
219 221
				return false;
220 222
			}
221 223
		}
tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages.properties (revision 1373)
1 1
#TXM messages generated by the PluginMessagesManager class
2 2
#Mon Nov 12 17:18:22 CET 2018
3
anErrorOccuredWhileGettingRWorkspaceInsanceColon=An error occured while getting RWorkspace insance\: 
3
anErrorOccuredWhileGettingRWorkspaceInsanceColon=An error occured while getting RWorkspace insance\: {0}.
4 4
checkingRPackages=Checking R packages...
5
CheckRPackages_23="')
6
CheckRPackages_36=\ (
5
CheckRPackages_23= 
6
CheckRPackages_36= 
7 7
connectingRConsoleToRWorkspaceStdoutAndStderr=Connecting RConsole to RWorkspace stdout and stderr.
8 8
doneColon=Done\: '
9
eRRORColonREvalIsNotAListColon=ERROR\: REval is not a list\: 
10
eRRORColonREvalListSizeIs0Colon=ERROR\: REval list size is 0\: 
11
eRRORColonRlistFirstElementIsNotREXPIntegerColon=ERROR\: Rlist first element is not REXPInteger\: 
9
eRRORColonREvalIsNotAListColon=ERROR\: REval is not a list\: {0}.
10
eRRORColonREvalListSizeIs0Colon=ERROR\: REval list size is 0\: {0}.
11
eRRORColonRlistFirstElementIsNotREXPIntegerColon=ERROR\: Rlist first element is not REXPInteger\: {0}.
12 12
errorWhileInitializingRConsoleColon=Error while initializing RConsole\: 
13
errorWhileInstallingPackageColon=Error while installing package\: 
14
failedCurrentVersionIsStill=' failed (current version is still 
15
installedSuccessfully=' installed successfully.
13
errorWhileInstallingPackageColon=Error while installing package\: {0}.
14
failedCurrentVersionIsStill=
15
installedSuccessfully=Package '{0}' successfully installed.
16 16
necessaryPackagesAreReady=Necessary packages are ready.
17
packageIsNotInstalledTryingToInstallItNow=' package is not installed. Trying to install it now...
18
packageWasNotInstalledPleaseInstallItManuallyColonRunRAndExecuteInstallpackages=' package was not installed. Please install it manually\:\n * Run R\n * and execute 'install.packages("
17
packageIsNotInstalledTryingToInstallItNow=
18
packageWasNotInstalledPleaseInstallItManuallyColonRunRAndExecuteInstallpackages= 
19 19
password=Password
20 20
pathToRBinary=Path to R binary
21 21
portDefaultIs6311=Port (default is 6311)
......
24 24
refreshVariables=Refresh variables
25 25
remoteConnection=Remote connection
26 26
rPackageDiagnostic=R package diagnostic
27
rPackageUpToVersion=) R package up to version 
27
rPackageUpToVersion=
28 28
rserveArgs=Rserve args
29 29
runRServeInDebugMode=Run RServe in debug mode
30 30
sendingToRWorkspaceColon=Sending to R Workspace\:
31 31
serverAddress=Server address
32 32
showEvalLogs=Show eval logs
33 33
somePackagesAreMissingSeeConsoleForDetails=Some packages are missing. See console for details.
34
the=The '
34
the=
35 35
theRStatEngineIsNotRunningTryingToReinstallThePackagesRServeFactoMineRTextometry=The R StatEngine is not running. Trying to reinstall the packages (RServe, FactoMineR, textometry,...
36 36
tXMCouldNotLoadTheFactoMineRRPackageTheCorrespondanceAnalysisClassificationCommandsWontBeAvailable=TXM could not load the 'FactoMineR' R package. The Correspondance analysis, Classification commands won't be available
37 37
tXMCouldNotLoadTheTextometryRPackageTheCooccurenceSpecificityAndProgressionCommandsWontBeAvailable=TXM could not load the 'textometry' R package. The Cooccurence, Specificity and Progression commands won't be available
38 38
tXMCouldNotReinstallRPackagesPleaseDoItManuallySeeManual=TXM could not reinstall R packages. Please do it manually (see manual).
39 39
tXMNameP0SupSupRNameP1="TXM name {0} >> R name {1}
40
updateOf=Update of '
41
updatingThe=Updating the 
40
updateOf=
41
updatingThe=
42 42
useFileBasedRDataTransfert=Use file based R data transfert
43 43
user=User
44
warningColonWindowsUsersNeedToRestartTXM=). Warning\: Windows users need to restart TXM.
44
warningColonWindowsUsersNeedToRestartTXM=

Formats disponibles : Unified diff