Révision 1526

tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties (revision 1526)
483 483
aWordWithItsProperties=un mot avec les propriétés
484 484
removeTheLastWord=Retirer le dernier mot
485 485
withinAContextOf=dans un context de
486
isDifferentFrom=est différent de 
486
isDifferentFrom=est différent de 
487
installingSampleCorpus=Installation des corpus exemples...
488
binaryCorpusIsNotATXM080CorpusNoSettingsNorProjectFile=Le corpus binaire {0} n'est pas un corpus TXM 0.8.0 (pas de fichier ".settings" ou ".project")
489
loadingTheP0BinaryCorpusAsATXM080Corpus=Chargment du corpus binaire 0.8.0 {0}...
490
loadingTheP0BinaryCorpusAsATXM079Corpus=Chargment du corpus binaire 0.7.9 {0}...
491
abortingLoadingOfPOACorpusWithTheSameNameAlreadyExists=Abandon du chargement du corpus {0} : un corpus de même nom existe déjà.
492
binaryCorpusIsNotATXM079CorpusNoImportXmlFile=Le corpus n'est pas un corpus TXM 0.7.9 (pas de fichier "import.xml")
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java (revision 1526)
574 574

  
575 575

  
576 576

  
577
	public static String isDifferentFrom; 
577
	public static String isDifferentFrom;
578 578

  
579 579

  
580

  
581
	public static String installingSampleCorpus;
582

  
583

  
584

  
585
	public static String binaryCorpusIsNotATXM080CorpusNoSettingsNorProjectFile;
586

  
587

  
588

  
589
	public static String loadingTheP0BinaryCorpusAsATXM080Corpus;
590

  
591

  
592

  
593
	public static String loadingTheP0BinaryCorpusAsATXM079Corpus;
594

  
595

  
596

  
597
	public static String abortingLoadingOfPOACorpusWithTheSameNameAlreadyExists;
598

  
599

  
600

  
601
	public static String binaryCorpusIsNotATXM079CorpusNoImportXmlFile; 
602

  
603

  
580 604
	
581 605
	static {
582 606
		// initialize resource bundle
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 1526)
482 482
aWordWithItsProperties=a word with properties
483 483
removeTheLastWord=Remove the last word
484 484
withinAContextOf=within a context of
485
isDifferentFrom=is different from
485
isDifferentFrom=is different from
486
installingSampleCorpus=Installing sample corpus...
487
binaryCorpusIsNotATXM080CorpusNoSettingsNorProjectFile={0} binary corpus is not a TXM 0.8.0 corpus (no .settings nor .project file
488
loadingTheP0BinaryCorpusAsATXM080Corpus=Loading the {0} binary corpus as a TXM 0.8.0 corpus...
489
loadingTheP0BinaryCorpusAsATXM079Corpus=Loading the {0} binary corpus as a TXM 0.7.9 corpus...
490
abortingLoadingOfPOACorpusWithTheSameNameAlreadyExists=Aborting loading of {0}. A corpus with the same name already exists.
491
binaryCorpusIsNotATXM079CorpusNoImportXmlFile=Binary corpus is not a TXM 0.7.9 corpus (no import.xml file)
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java (revision 1526)
66 66
		}
67 67
		
68 68
		if (!Zip.hasEntries(zipFile, basedirname+"/.settings/", basedirname+"/.project", basedirname+"/data/", basedirname+"/txm/", basedirname+"/HTML/", basedirname+"/registry/")) {
69
			System.out.println(zipFile.getName()+" binary corpus is not a TXM 0.8.0 corpus (no .settings nor .project file)");
69
			Log.info(NLS.bind(TXMUIMessages.binaryCorpusIsNotATXM080CorpusNoSettingsNorProjectFile, zipFile.getName()));
70 70
			return null;
71 71
		}
72 72
		
73
		System.out.println(NLS.bind("Loading the {0} binary corpus as a TXM 0.8.0 corpus...", zipFile.getName()));
73
		System.out.println(NLS.bind(TXMUIMessages.loadingTheP0BinaryCorpusAsATXM080Corpus, zipFile.getName()));
74 74
		
75 75
		try {
76 76
			//System.out.println(NLS.bind(Messages.AddBase_29, zipFile, corporaDir));
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java (revision 1526)
66 66
		
67 67
		Project p = Toolbox.workspace.getProject(basedirname.toUpperCase());
68 68
		if (p != null) {
69
			System.out.println("Aborting loading of "+zipFile+". A corpus with the same name already exists.");
69
			System.out.println(NLS.bind(TXMUIMessages.abortingLoadingOfPOACorpusWithTheSameNameAlreadyExists, zipFile));
70 70
			return null;
71 71
		}
72 72
		
73 73
		if (!Zip.hasEntries(zipFile, basedirname+"/import.xml", basedirname+"/data/", basedirname+"/txm/", basedirname+"/HTML/", basedirname+"/registry/")) {
74
			System.out.println("Binary corpus is not a TXM 0.7.9 corpus (no import.xml file)");	
74
			System.out.println(TXMUIMessages.binaryCorpusIsNotATXM079CorpusNoImportXmlFile);	
75 75
			return null;
76 76
		}
77 77

  
78
		System.out.println(NLS.bind("Loading the {0} binary corpus as a TXM 0.7.9 corpus...", zipFile.getName()));
78
		System.out.println(NLS.bind(TXMUIMessages.loadingTheP0BinaryCorpusAsATXM079Corpus, zipFile.getName()));
79 79
		
80 80
		//ZIPPED FILE
81 81
		monitor.beginTask(TXMUIMessages.loadingBinaryCorpus, 100);
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 1526)
32 32
import java.io.PrintStream;
33 33
import java.lang.reflect.InvocationTargetException;
34 34
import java.net.URL;
35
import java.text.DateFormat;
36
import java.text.SimpleDateFormat;
35 37
import java.util.ArrayList;
36 38
import java.util.Arrays;
37 39
import java.util.Date;
40
import java.util.Locale;
38 41
import java.util.logging.Handler;
39 42
import java.util.logging.Level;
40 43
import java.util.logging.LogRecord;
......
330 333
		String version =  Activator.getDefault().getBundle().getVersion().toString(); // "0.7.7.201412160925";
331 334
		version = version.replaceAll("(.\\..\\..)\\.(....)(..)(..)(..)(..)", "$1 ($2-$3-$4 $5h$6)"); //$NON-NLS-1$ //$NON-NLS-2$
332 335
		System.out.print(NLS.bind(TXMUIMessages.startingUpP0, version));
333
		System.out.println(NLS.bind(" ({0})", new Date(Activator.getDefault().getBundle().getLastModified())));
336
		DateFormat formatter = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.getDefault());
337

  
338
		System.out.println(NLS.bind(" ({0})", formatter.format(new Date(Activator.getDefault().getBundle().getLastModified()))));
334 339
	}
335 340

  
336 341
	private void setPreferencesConfiguration() {
......
856 861
		
857 862
		// load corpora from the install directory
858 863
		if (sampleCorporaDirectory.exists()) { //$NON-NLS-1$
859
			System.out.println("Installing sample corpus...");
864
			System.out.println(TXMUIMessages.installingSampleCorpus);
860 865
			LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(sampleCorporaDirectory);
861 866
//			Log.info(TXMUIMessages.ApplicationWorkbenchAdvisor_11);
862 867
//			monitor.setTaskName(TXMUIMessages.ApplicationWorkbenchAdvisor_11);
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1526)
2234 2234
					this.children.get(i).setDirty();
2235 2235
				}
2236 2236

  
2237
				// Children cascade computing (if parent == null then it is the Workspace (Root leaf))
2237
				// Children cascade computing (if parent == null then it is the Workspace (Tree root))
2238 2238
				if (deepComputing && this.parent != null) {
2239 2239

  
2240 2240
					Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": cascade computing of " + this.children.size() + " child(ren).");
tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/StartRserve.java (revision 1526)
164 164
		int attempts = 10;
165 165
		while (attempts > 0) {
166 166
			try {
167
				System.out.print("."); //$NON-NLS-1$
167
				//System.out.print("."); //$NON-NLS-1$
168 168
				RConnection c = new RConnection("127.0.0.1", port); //$NON-NLS-1$
169 169
				c.close();
170 170
				return true;

Formats disponibles : Unified diff