Révision 1577

tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java (revision 1577)
49 49

  
50 50
	public static String error_unexpectedErrorInRStatisticsEngine;
51 51

  
52
	public static String rserveNotStartedUsingTheP0Path;
53

  
52 54
	static {
53 55
		// initialize resource bundle
54 56
		Utf8NLS.initializeMessages(BUNDLE_NAME, RCoreMessages.class);
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties (revision 1577)
32 32
p0RScriptDoesntExist=** The R script file {0} doesn''t exist.
33 33
runningP0=Running {0}…
34 34
runningTextSelection=Running text selection…
35
rserveNotStartedUsingTheP0Path=** Error: Rserve not started using the {0} path. 
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_fr.properties (revision 1577)
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}.
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java (revision 1577)
342 342
			isRServerOk = StartRserve.launchRserve(pathToRExecutable, port, debug, rargs, rServeArgs);
343 343
			// System.out.println("ap launchRserve");
344 344
			if (!isRServerOk) {
345
				Log.severe("Rserve not started with " + pathToRExecutable + ". Trying with commons R installation paths (will works if Rserve, textometry and FactoMineR are installed).");
346
				isRServerOk = StartRserve.checkLocalRserve(port, debug, rargs, rServeArgs);
345
				Log.severe(NLS.bind(RCoreMessages.rserveNotStartedUsingTheP0Path, pathToRExecutable));
346
				//isRServerOk = StartRserve.checkLocalRserve(port, debug, rargs, rServeArgs);
347 347
			}
348 348
			
349 349
			if (!isRServerOk) {
tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java (revision 1577)
8 8
import org.eclipse.core.runtime.IProgressMonitor;
9 9
import org.eclipse.core.runtime.IStatus;
10 10
import org.eclipse.core.runtime.Status;
11
import org.eclipse.osgi.util.NLS;
11 12
import org.txm.Toolbox;
12 13
import org.txm.annotation.core.AnnotationEngine;
13 14
import org.txm.core.engines.Engine;
14 15
import org.txm.core.engines.EngineType;
15 16
import org.txm.core.engines.ScriptedImportEngine;
16 17
import org.txm.core.results.TXMResult;
18
import org.txm.groovy.core.messages.GroovyMessages;
17 19
import org.txm.objects.CorpusBuild;
18 20
import org.txm.objects.Edition;
19 21
import org.txm.objects.Project;
......
119 121
			}
120 122

  
121 123
			ExecTimer.start();
122
			Log.info("Start of Groovy import script: " + mainScript.getAbsolutePath()); //$NON-NLS-1$
124
			Log.info(NLS.bind(GroovyMessages.startingTheP0GroovyImportScript, mainScript.getAbsolutePath())); //$NON-NLS-1$
123 125
			gse.run(mainScript.toURI().toURL().toString(), binding); // run the groovy import script
124 126
			Log.fine("\nEnd of Groovy import script: " + ExecTimer.stop()); //$NON-NLS-1$
125 127
			monitor.worked(90);
......
142 144
//					Log.info("Save workspace"); //$NON-NLS-1$
143 145
//					Toolbox.workspace.save();
144 146

  
145
					Log.info("Restarting Toolbox search engine...");
147
					Log.info(GroovyMessages.restartingToolboxSearchengines);
146 148
					//Toolbox.restartWorkspace(null);
147 149
					Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
148 150

  
tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/messages/messages.properties (revision 1577)
1
restartingToolboxSearchengines=Restarting search engine...
2
startingTheP0GroovyImportScript=Starting the {0} Groovy import script.
0 3

  
tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/messages/messages_fr.properties (revision 1577)
1
restartingToolboxSearchengines=Red?marrage des moteurs de recherche...
2
startingTheP0GroovyImportScript=D?marrage du script d'import Groovy {0}.
0 3

  
tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/messages/GroovyMessages.java (revision 1577)
1
package org.txm.groovy.core.messages;
2

  
3
import org.txm.core.messages.TXMCoreMessages;
4
import org.txm.utils.messages.Utf8NLS;
5

  
6
public class GroovyMessages extends TXMCoreMessages {
7
	
8
	private static final String BUNDLE_NAME = "org.txm.groovy.core.messages.messages"; //$NON-NLS-1$
9
	public static String restartingToolboxSearchengines;
10
	public static String startingTheP0GroovyImportScript;
11
	
12
	static {
13
		// initialize resource bundle
14
		Utf8NLS.initializeMessages(BUNDLE_NAME, GroovyMessages.class);
15
	}
16
}
0 17

  
tmp/org.txm.groovy.core/.settings/org.eclipse.core.resources.prefs (revision 1577)
1
eclipse.preferences.version=1
2
encoding//src/java/org/txm/groovy/core/messages/messages.properties=UTF-8
0 3

  
tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java (revision 1577)
1099 1099
	}
1100 1100

  
1101 1101
	public void setHighlightedArea(HashSet<int[]> positions) {
1102
		Log.severe("Highlight area: not implemented");
1102
		Log.fine("Highlight area: not implemented");
1103 1103
	}
1104 1104

  
1105 1105
	public void expandSelectionTo(String[] ids) {
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1577)
199 199
	 */
200 200
	protected boolean computing = false;
201 201

  
202
	/**
203
	 * Generic toString method for TXMResults
204
	 */
205
	public String toString() {
206
		if (userName != null) return userName;
207
		else if (lazyName != null) return lazyName;
208
		
209
		return super.toString();
210
	}
202 211

  
203 212
	/**
204 213
	 * Creates a new TXMResult, child of the specified parent.
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java (revision 1577)
274 274
			} else {
275 275
				r.delete();
276 276
			}
277
			Log.info(NLS.bind(TXMUIMessages.deletedColonP0, ((TXMResult) o)));
277
			Log.info(NLS.bind(TXMUIMessages.deletedColonP0, o));
278 278
			deleted.add(o);
279 279
		}
280 280
		else {
tmp/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java (revision 1577)
338 338
	@Override
339 339
	public boolean canCompute() {
340 340
		if (this.getPartition() == null) {
341
			Log.severe("Partition not set."); //$NON-NLS-1$
341
			Log.fine("Partition not set."); //$NON-NLS-1$
342 342
			return false;
343 343
		}
344 344

  
345 345
		if (pProperties == null || pProperties.size() == 0) {
346
			Log.severe("No property set."); //$NON-NLS-1$
346
			Log.fine("No property set."); //$NON-NLS-1$
347 347
			return false;
348 348
		}
349 349

  
350 350
		if (pQuery == null || pQuery.getQueryString().length() == 0) {
351
			Log.severe("No query set."); //$NON-NLS-1$
351
			Log.fine("No query set."); //$NON-NLS-1$
352 352
			return false;
353 353
		}
354 354

  

Formats disponibles : Unified diff