Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties	(revision 2505)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties	(revision 2506)
@@ -1,35 +1,44 @@
-#TXM messages generated by the PluginMessagesManager class
-#Tue Dec 18 10:24:08 CET 2018
-doneColon=Done in {0} ms.
-error_cantFindRServeInPath=** The statistics engine program path is set ({0}) but we couldn''t find it.
-error_connectionFailed=** Error while connecting to the statistics engine.
-error_errorDuringItemsListExtraction=** Error while retrieving the list of items \: \t
-error_errorWhileEvaluating=** R error\: "{0}"\nwhile evaluating\: {1} 
-error_evaluationError=** Evaluation error\: {0}\n{1}.
-error_failedToConnectToTheRWorkspace=** Failed to connect to the R Workspace with {0}, {1} and {2}.
-error_failedToInitializeFileTransfert=** Failed to initialize file transfer\: {0}.
-error_failedToLoadLibrary=** Failed to load the {0} library\: {1}.
-error_failedToRunREG=** Failed to run REG to locate the R program.
-error_failedToStartRServe=** Failed to start the statistics engine (RServe).
-error_failedToStartRServeWithCommand=** Failed to start Rserve with command\: 
-error_matrixIsEmpty=Matrix is empty.
-error_requestedObjectNotFoundInR=The requested object ({0}) was not found in the R workspace.
-error_rserveIsAlreadyRunningOnPort=** Rserve is already running on port {0}.
-error_rservePathNotSet=** The statistics engine program path is not set and we could not find it.
-error_unexpectedErrorInRStatisticsEngine=** Unexpected error in R statistics engine\: {0}.
-error_youNeedRSoftware=You need the 'R' software and you need to configure its access paths via the preferences window 'Tools / Preferences'.
-errorWhileRunningRScriptP0ColonP1=** Error while running R script {0}\: {1}.
-info_connectingToRAt=Connecting to R at address {0}\:{1}.
-info_connectingToRAtWithUser=Connecting to R at address {0}\:{1} with user {2}.
-info_lastSafeEvalExpression=Last safeeval expression\: {0}.
-info_rPathNotSetTryingToFindIt=R executable file path not specified, searching it in standard locations...
-info_savingChartToFile=Saving chart to file\: {0}.
-info_startingRWithCommandLine=Starting R with command line\: {0}
-info_startingStatsEngine=Starting statistics engine\: user \= {0}, remote \= {1}, port \= {2}, debug \= {3}.
-info_statisticsEngineLaunched=Statistical engine launched.
-info_tryingToStartRFrom=Trying to start R from {0}…
-info_tryingToStartRWithRPath=Trying to start R from path 'R'.
-p0RScriptDoesntExist=** The R script file {0} doesn''t exist.
-runningP0=Running {0}…
-runningTextSelection=Running text selection…
-rserveNotStartedUsingTheP0Path=** Error: Rserve not started using the {0} path. 
\ No newline at end of file
+#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
+#TXM messages generated by the PluginMessagesManager class
+#Tue Dec 18 10:24:08 CET 2018
+
+doneColon = Done in {0} ms.
+
+errorWhileRunningRScriptP0ColonP1 = ** Error while running R script {0}: {1}.
+
+error_cantFindRServeInPath               = ** The statistics engine program path is set ({0}) but we couldn''t find it.
+error_connectionFailed                   = ** Error while connecting to the statistics engine.
+error_errorDuringItemsListExtraction     = ** Error while retrieving the list of items : \	
+error_errorWhileEvaluating               = ** R error: "{0}"\nwhile evaluating: {1} 
+error_evaluationError                    = ** Evaluation error: {0}\n{1}.
+error_failedToConnectToTheRWorkspace     = ** Failed to connect to the R Workspace with {0}, {1} and {2}.
+error_failedToInitializeFileTransfert    = ** Failed to initialize file transfer: {0}.
+error_failedToLoadLibrary                = ** Failed to load the {0} library: {1}.
+error_failedToRunREG                     = ** Failed to run REG to locate the R program.
+error_failedToStartRServe                = ** Failed to start the statistics engine (RServe).
+error_failedToStartRServeWithCommand     = ** Failed to start Rserve with command: 
+error_matrixIsEmpty                      = Matrix is empty.
+error_requestedObjectNotFoundInR         = The requested object ({0}) was not found in the R workspace.
+error_rserveIsAlreadyRunningOnPort       = ** Rserve is already running on port {0}.
+error_rservePathNotSet                   = ** The statistics engine program path is not set and we could not find it.
+error_unexpectedErrorInRStatisticsEngine = ** Unexpected error in R statistics engine: {0}.
+error_youNeedRSoftware                   = You need the 'R' software and you need to configure its access paths via the preferences window 'Tools / Preferences'.
+
+info_connectingToRAt           = Connecting to R at address {0}:{1}.
+info_connectingToRAtWithUser   = Connecting to R at address {0}:{1} with user {2}.
+info_lastSafeEvalExpression    = Last safeeval expression: {0}.
+info_rPathNotSetTryingToFindIt = R executable file path not specified, searching it in standard locations...
+info_savingChartToFile         = Saving chart to file: {0}.
+info_startingRWithCommandLine  = Starting R with command line: {0}
+info_startingStatsEngine       = Starting statistics engine: user = {0}, remote = {1}, port = {2}, debug = {3}.
+info_statisticsEngineLaunched  = Statistics engine launched.
+info_tryingToStartRFrom        = Trying to start R from {0}…
+info_tryingToStartRWithRPath   = Trying to start R from path 'R'.
+
+p0RScriptDoesntExist = ** The R script file {0} doesn''t exist.
+
+rserveNotStartedUsingTheP0Path = ** Error: Rserve not started using the {0} path. 
+
+runningP0 = Running {0}…
+
+runningTextSelection = Running text selection…
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/preferences/RPreferences.java
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/preferences/RPreferences.java	(revision 2505)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/preferences/RPreferences.java	(revision 2506)
@@ -19,73 +19,82 @@
  *
  */
 public class RPreferences extends TXMPreferences {
-
-
+	
+	
 	public static final String PREFERENCES_PREFIX = "r_"; //$NON-NLS-1$
 	
 	/** The Constant R_REMOTE. */
 	public static final String IS_MANDATORY = PREFERENCES_PREFIX + "is_mandatory"; //$NON-NLS-1$
-
+	
 	/** The Constant R_PATH_TO_EXECUTABLE. */
 	public static final String PATH_TO_EXECUTABLE = PREFERENCES_PREFIX + "path_to_executable"; //$NON-NLS-1$
-
+	
 	/** The Constant R_REMOTE. */
 	public static final String REMOTE = PREFERENCES_PREFIX + "remote"; //$NON-NLS-1$
+	
 	public static final String DEBUG = PREFERENCES_PREFIX + "debug"; //$NON-NLS-1$
-
+	
 	/** The Constant R_SERVER_ADDRESS. */
 	public static final String SERVER_ADDRESS = PREFERENCES_PREFIX + "server_address"; //$NON-NLS-1$
-
+	
 	/** The Constant R_PORT. */
 	public static final String PORT = PREFERENCES_PREFIX + "port"; //$NON-NLS-1$
-
+	
 	/** The Constant R_USER. */
 	public static final String USER = PREFERENCES_PREFIX + "user"; //$NON-NLS-1$
-
+	
 	/** The Constant R_PASSWORD. */
 	public static final String PASSWORD = PREFERENCES_PREFIX + "password"; //$NON-NLS-1$
-
+	
 	// FIXME: SJ: not used anymore?
 	/** The Constant R_PACKAGES_PATH. */
 	public static final String PACKAGES_PATH = PREFERENCES_PREFIX + "packages_path"; //$NON-NLS-1$
-
+	
 	public static final String RARGS = PREFERENCES_PREFIX + "rargs"; //$NON-NLS-1$
+	
 	public static final String RSERVEARGS = PREFERENCES_PREFIX + "rserveargs"; //$NON-NLS-1$
-
+	
 	/** The Constant R_DISABLE. */
 	public static final String DISABLE = PREFERENCES_PREFIX + "disable"; //$NON-NLS-1$
-
+	
 	/** The Constant R_FILE_TRANSFERT. */
 	public static final String FILE_TRANSFERT = PREFERENCES_PREFIX + "file_transfert"; //$NON-NLS-1$
+	
 	public static final String SVG_DEVICE = PREFERENCES_PREFIX + "svg_device"; //$NON-NLS-1$
-
-	/** Last version since R Preferences have been set -> the setting is done only ONE time.*/
+	
+	/** Last version since R Preferences have been set -> the setting is done only ONE time. */
 	public static final String VERSION = "version"; //$NON-NLS-1$
-
+	
 	/**
 	 * To show or not not the R eval command lines.
 	 */
 	public static final String SHOW_EVAL_LOGS = "show_eval_logs"; //$NON-NLS-1$
 	
-
 	
 	/**
+	 * Gets the instance.
 	 * 
+	 * @return the instance
 	 */
-	public RPreferences() {
-		// TODO Auto-generated constructor stub
+	public static TXMPreferences getInstance() {
+		if (!TXMPreferences.instances.containsKey(RPreferences.class)) {
+			new RPreferences();
+		}
+		return TXMPreferences.instances.get(RPreferences.class);
 	}
-
+	
+	
+	
 	@Override
 	public void initializeDefaultPreferences() {
 		super.initializeDefaultPreferences();
 		
 		
 		// FIXME: SJ: some code in this method should be done only at TXM first run
-
 		
+		
 		Preferences preferences = this.getDefaultPreferencesNode();
-
+		
 		preferences.putBoolean(IS_MANDATORY, false);
 		preferences.put(SERVER_ADDRESS, "127.0.0.1");
 		preferences.putBoolean(REMOTE, false);
@@ -100,14 +109,14 @@
 		preferences.put(SVG_DEVICE, "svg");
 		preferences.putBoolean(SHOW_EVAL_LOGS, false);
 		
-		String RFRAGMENT = "org.txm.statsengine.r.core."+System.getProperty("osgi.os"); //$NON-NLS-1$
+		String RFRAGMENT = "org.txm.statsengine.r.core." + System.getProperty("osgi.os"); //$NON-NLS-1$
 		
 		Log.fine("RPreferences.initializeDefaultPreferences()");
 		
 		String saved = getString(RPreferences.VERSION);
 		Version currentVersion = BundleUtils.getBundleVersion(RFRAGMENT); // the RFRAGMENT plugin contains the right version
 		
-		//ensure plugin binary files rights are ok
+		// ensure plugin binary files rights are ok
 		String os = ""; //$NON-NLS-1$
 		String ext = ""; //$NON-NLS-1$
 		String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
@@ -116,14 +125,16 @@
 			os = "win32"; //$NON-NLS-1$
 			extraSubPath = "x64/";
 			ext = ".exe"; //$NON-NLS-1$
-		} else if (osName.contains("mac")) { //$NON-NLS-1$
+		}
+		else if (osName.contains("mac")) { //$NON-NLS-1$
 			os = "macosx"; //$NON-NLS-1$
-		} else {
+		}
+		else {
 			os = "linux32";  //$NON-NLS-1$
-			if (System.getProperty("os.arch").contains("64")) //$NON-NLS-1$  //$NON-NLS-2$
+			if (System.getProperty("os.arch").contains("64")) //$NON-NLS-1$ //$NON-NLS-2$
 				os = "linux64";  //$NON-NLS-1$
 		}
-
+		
 		File bundleDir = BundleUtils.getBundleFile(RFRAGMENT);
 		if (bundleDir == null) {
 			Log.severe(TXMCoreMessages.bind("Error while retrieving {0} bundle directory.", RFRAGMENT));
@@ -134,21 +145,22 @@
 		File execFile = new File(OSDir, "bin/" + extraSubPath + "R" + ext); //$NON-NLS-1$ //$NON-NLS-2$
 		execFile.setExecutable(true);
 		
-				
+		
 		if (!osName.contains("windows")) {  //$NON-NLS-1$
 			try {
 				Log.fine(TXMCoreMessages.bind("Setting execution file rights to: {0}.", OSDir.getAbsolutePath()));
-				Process p = Runtime.getRuntime().exec("chmod -R +x "+OSDir.getAbsolutePath()); //$NON-NLS-1$
+				Process p = Runtime.getRuntime().exec("chmod -R +x " + OSDir.getAbsolutePath()); //$NON-NLS-1$
 				new StreamHog(p.getInputStream(), false);
 				new StreamHog(p.getErrorStream(), false);
 				p.waitFor();
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Log.severe(TXMCoreMessages.bind("Error while setting execution file rights to: {0}.", OSDir.getAbsolutePath()));
 				e.printStackTrace();
 				return;
 			}
 		}
-	
+		
 		if (!execFile.exists()) {
 			Log.severe(TXMCoreMessages.bind("Can not find R executable file: {0}.", execFile));
 			return;
@@ -161,7 +173,7 @@
 		
 		preferences.put(PATH_TO_EXECUTABLE, execFile.getAbsolutePath());
 		
-
+		
 		if (saved != null && saved.length() > 0) {
 			Version savedVersion = new Version(saved);
 			if (currentVersion.compareTo(savedVersion) <= 0) {
@@ -193,14 +205,4 @@
 		Log.fine(TXMCoreMessages.bind("R stats engine preferences set with: {0} and {1}.", OSDir.getAbsolutePath(), execFile.getAbsolutePath())); //$NON-NLS-1$
 	}
 	
-	/**
-	 * Gets the instance.
-	 * @return the instance
-	 */
-	public static TXMPreferences getInstance()	{
-		if (!TXMPreferences.instances.containsKey(RPreferences.class)) {
-			new RPreferences();
-		}
-		return TXMPreferences.instances.get(RPreferences.class);
-	}
 }
