/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

     URSCorpora_3=N/A_Fail to open corpus file:
     URSCorpora_4=N/A_Fail to create corpus file:
     DoInstallStep_10=N/A_. Aborting
     DoInstallStep_11=N/A_Previous version of Analec macros are moved to:
     DoInstallStep_17=N/A_Error while coping Analec org/txm/macro/analec in
     DoInstallStep_18=N/A_Analec post-installation done.
-...
     ExportGlozzCorpus_1=N/A_\ Glozz export
     ExportGlozzCorpus_2=N/A_Canceled.
     ExportGlozzCorpus_3=N/A_Error while exporting annotations :
     ExportGlozzCorpus_4=N/A_Error while exporting annotations :
     ExportTEICorpus_0=N/A_Selection is not a corpus:
     ExportTEICorpus_1P0={0} annotations export...
     ExportTEICorpus_2=N/A_Error while exporting corpus.
     ExportTEICorpus_3=N/A_Error while exporting corpus to XML-Analec:
     ExportTEICorpus_4=N/A_Error while exporting annotations:
     ImportGlozzAnnotations_0=N/A_The AA AAM and AC files must exists.
     ImportGlozzAnnotations_1=N/A_Selection is not a main corpus:
     ImportGlozzAnnotations_10=N/A_Done.
-...
     ImportTEIAnnotations_1=N/A_\ annotations import...
     ImportTEIAnnotations_2=N/A_Error while importing annotations.
     ImportTEIAnnotations_3=N/A_Error while importing annotations:
     ImportTEIAnnotations_4=N/A_Error while exporting annotations:
     ImportTEIAnnotations_5=N/A_Done:
     ImportTEIAnnotations_6=N/A_\ unites
     ImportTEIAnnotations_7=N/A_\ relations
     ImportTEIAnnotations_8=N/A_\ schemas.
     ImportTEICorpus_0=N/A_The XML files must exists:
     ImportTEICorpus_11=N/A_ERROR: could not save import configuration:
-...
     LoadVue_2=N/A_Fail to load structure.
     LoadVue_3=N/A_Done:
     SaveCorpus_0=N/A_Selection is not a main corpus:
     SaveCorpus_1=N/A_\ in
     SaveCorpus_3=N/A_Saving structure for corpus=
     SaveCorpus_3=Sauvegarde du corpus {0} ({1})
     SaveCorpus_5=N/A_Erreur lors de la sauvegarde du corpus.
     SaveStructure_0=N/A_Selection is not a main corpus:
     SaveStructure_3=N/A_Saving structure for corpus=
     SaveStructure_3=Sauvegarde de la  structure du corpus {0} ({1})
     SaveStructure_4=N/A_\ in
     SaveStructure_5=N/A_Erreur lors de la sauvegarde de la structure.
     SaveStructureAsGlozzModel_0=N/A_Selection is not a main corpus:
-...
     UnitToolbar_29=N/A_Select
     UnitToolbar_3=N/A_** Could not retrieve
     UnitToolbar_32=N/A_Select
     UnitToolbar_4=N/A_\ size:
     UnitToolbar_44=N/A_Creating unit with start=
     UnitToolbar_45=N/A_\ end=
     UnitToolbar_46=N/A_org.txm.annotation.urs.delete
     UnitToolbar_47=N/A_Delete unit {0}
     UnitToolbar_48=N/A_Do you really want to delete unit
     UnitToolbar_49=N/A_\ ?
     UnitToolbar_5=N/A_Type d''unit? :
     UnitToolbar_50=N/A_Aborting annotation limit update
     UnitToolbar_51=N/A_Identifiants SelectionListener:
-...
     UnitToolbar_59=N/A_Error no word found for id=
     UnitToolbar_6=N/A_Type d''unit?
     UnitToolbar_60=N/A_Updating annotation limits:
     UnitToolbar_61=N/A_\ ->
     UnitToolbar_62=N/A_\ with word id=
     UnitToolbar_63=N/A_\ with pos=
     UnitToolbar_7=N/A_Type d''unit?
     UnitToolbar_8=N/A_Cr?er
     StartButton_0=N/A_Units
-...
     StartButton_9=N/A_You need to import an annotation structure before starting to annotate. Select the edition main corpus (
     NavigationField_0=N/A_<identifiant>
     NavigationField_2=N/A_Wrong unit ID:
     NavigationField_3=N/A_Wrong unit ID:
     NavigationField_4=N/A_Rechercher par les propri?t?s de ce type d''unit?
     NavigationField_5=N/A_<identifiant>

     URSCorpora_3=N/A_Fail to open corpus file:
     URSCorpora_4=N/A_Fail to create corpus file:
     DoInstallStep_10=N/A_. Aborting
     DoInstallStep_11=N/A_Previous version of Analec macros are moved to:
     DoInstallStep_17=N/A_Error while coping Analec org/txm/macro/analec in
     DoInstallStep_18=N/A_Analec post-installation done.
-...
     ExportGlozzCorpus_1=N/A_\ Glozz export
     ExportGlozzCorpus_2=N/A_Canceled.
     ExportGlozzCorpus_3=N/A_Error while exporting annotations :
     ExportGlozzCorpus_4=N/A_Error while exporting annotations :
     ExportTEICorpus_0=N/A_Selection is not a corpus:
     ExportTEICorpus_1P0={0} annotations export...
     ExportTEICorpus_2=N/A_Error while exporting corpus.
     ExportTEICorpus_3=N/A_Error while exporting corpus to XML-Analec:
     ExportTEICorpus_4=N/A_Error while exporting annotations:
     ImportGlozzAnnotations_0=N/A_The AA AAM and AC files must exists.
     ImportGlozzAnnotations_1=N/A_Selection is not a main corpus:
     ImportGlozzAnnotations_10=N/A_Done.
-...
     ImportTEIAnnotations_1=N/A_\ annotations import...
     ImportTEIAnnotations_2=N/A_Error while importing annotations.
     ImportTEIAnnotations_3=N/A_Error while importing annotations:
     ImportTEIAnnotations_4=N/A_Error while exporting annotations:
     ImportTEIAnnotations_5=N/A_Done:
     ImportTEIAnnotations_6=N/A_\ unites
     ImportTEIAnnotations_7=N/A_\ relations
     ImportTEIAnnotations_8=N/A_\ schemas.
     ImportTEICorpus_0=N/A_The XML files must exists:
     ImportTEICorpus_11=N/A_ERROR: could not save import configuration:
-...
     LoadVue_2=N/A_Fail to load structure.
     LoadVue_3=N/A_Done:
     SaveCorpus_0=N/A_Selection is not a main corpus:
     SaveCorpus_1=N/A_\ in
     SaveCorpus_3=N/A_Saving structure for corpus=
     SaveCorpus_5=N/A_Erreur lors de la sauvegarde du corpus.
     SaveStructure_0=N/A_Selection is not a main corpus:
-...
     UnitToolbar_29=N/A_Select
     UnitToolbar_3=N/A_** Could not retrieve
     UnitToolbar_32=N/A_Select
     UnitToolbar_4=N/A_\ size:
     UnitToolbar_44=N/A_Creating unit with start=
     UnitToolbar_45=N/A_\ end=
     UnitToolbar_46=N/A_org.txm.annotation.urs.delete
     UnitToolbar_47=N/A_Delete unit {0}
     UnitToolbar_48=N/A_Do you really want to delete unit
     UnitToolbar_49=N/A_\ ?
     UnitToolbar_5=N/A_Type d''unit? :
     UnitToolbar_50=N/A_Aborting annotation limit update
     UnitToolbar_51=N/A_Identifiants SelectionListener:
-...
     UnitToolbar_59=N/A_Error no word found for id=
     UnitToolbar_6=N/A_Type d''unit?
     UnitToolbar_60=N/A_Updating annotation limits:
     UnitToolbar_61=N/A_\ ->
     UnitToolbar_62=N/A_\ with word id=
     UnitToolbar_63=N/A_\ with pos=
     UnitToolbar_7=N/A_Type d''unit?
     UnitToolbar_8=N/A_Cr?er
     StartButton_0=N/A_Units
-...
     StartButton_9=N/A_You need to import an annotation structure before starting to annotate. Select the edition main corpus (
     NavigationField_0=N/A_<identifiant>
     NavigationField_2=N/A_Wrong unit ID:
     NavigationField_3=N/A_Wrong unit ID:
     NavigationField_4=N/A_Rechercher par les propri?t?s de ce type d''unit?
     NavigationField_5=N/A_<identifiant>

     package org.txm.rcp.commands.tests;
     import java.io.File;
     import java.util.ArrayList;
     import java.util.List;
     import org.txm.groovy.core.GSERunner;
     import groovy.lang.Binding;
     public class Test {
     	String name;
     	File directory;
     	File create, export, test;
     	File create_ok, export_ok, test_ok;
     	File create_error, export_error, test_error;
     	File[] all = {create_ok, export_ok, test_ok, create_error, export_error, test_error};
     	private Binding binding;
     	public Test(File scriptDir, String name) {
     		this.name = name;
     		//File scriptDir = new File(Toolbox.getTxmHomePath(), "scripts/groovy/user/org/txm/tests");
     		scriptDir.mkdirs();
     		this.directory = new File(scriptDir, name);
     		this.directory.mkdirs();
     		create = new File(directory, "create.groovy");
     		export = new File(directory, "export.groovy");
     		test = new File(directory, "test.groovy");
     		create_ok = new File(directory, "create.ok");
     		export_ok = new File(directory, "export.ok");
     		test_ok = new File(directory, "test.ok");
     		create_error = new File(directory, "create.error");
     		export_error = new File(directory, "export.error");
     		test_error = new File(directory, "test.error");
+    	}
     	public void reset() {
     		create_ok.delete();
     		export_ok.delete();
     		test_ok.delete();
     		create_error.delete();
     		export_error.delete();
     		test_error.delete();
+    	}
     	public List<File> getLogs() {
     		ArrayList<File> logs = new ArrayList<File>();
     		for (File f : all) {
     			if (f.exists()) {
     				logs.add(f);
+    			}
+    		}
     		return logs;
+    	}
     	/**
+    	 *
     	 * @param start_step 0 starting step : all=create&export&test export=export&test test=step
     	 * @return
     	 */
     	public boolean run(int start_step) {
     		GSERunner gse = GSERunner.buildDefaultGSE();
     		System.out.println("Run "+name+" from "+start_step);
     		this.binding = new Binding();
     		try {
     			if (start_step <= 0) {
     				create_ok.delete();
     				create_error.delete();
     				Object ret_create = gse.run(create, binding);
     				if (ret_create != null && Boolean.FALSE != ret_create) {
     					binding.setProperty("results", ret_create);
     					create_ok.createNewFile();
     				} else {
     					create_error.createNewFile();
     					return false;
+    				}
+    			}
     			if (export.exists() && start_step <= 1) {
     				export_ok.delete();
     				export_error.delete();
     				Object ret_export = gse.run(export, binding);
     				if (ret_export != null && Boolean.FALSE != ret_export) {
     					export_ok.createNewFile();
     				} else {
     					create_error.createNewFile();
     					return false;
+    				}
     				if (test.exists() && start_step <= 2) {
     					test_ok.delete();
     					test_error.delete();
     					Object ret_test = gse.run(test, binding);
     					if (ret_test != null && Boolean.FALSE != ret_test) {
     						test_ok.createNewFile();
     					} else {
     						test_error.createNewFile();
     						return false;
+    					}
+    				}
+    			}
     		} catch (Exception e) {
     			e.printStackTrace();
     			return false;
+    		}
     		return true;
+    	}
     	public boolean hasCreateStep() {
     		return create.exists();
+    	}
     	public boolean hasExportStep() {
     		return export.exists();
+    	}
     	public boolean hasTestStep() {
     		return test.exists();
+    	}
     	public boolean isCreateStepOK() {
     		return create_ok.exists();
+    	}
     	public boolean isExportStepOK() {
     		return export_ok.exists();
+    	}
     	public boolean isTestStepOK() {
     		return test_ok.exists();
+    	}
     	public File getCreateStepScript() {
     		return create;
+    	}
     	public File getCreateStepLog() {
     		if (isCreateStepOK()) return create_ok;
     		return create_error;
+    	}
     	public File getExportStepScript() {
     		return export;
+    	}
     	public File getExportStepLog() {
     		if (isExportStepOK()) return export_ok;
     		return export_error;
+    	}
     	public File getTestStepScript() {
     		return test;
+    	}
     	public File getTestStepLog() {
     		if (isTestStepOK()) return test_ok;
     		return test_error;
+    	}
     	public String getName() {
     		return name;
+    	}
     	public File getDirectory() {
     		return directory;
+    	}
+    }

     package org.txm.rcp.commands.tests;
     import java.io.File;
     import java.io.IOException;
     import java.util.HashMap;
     import org.txm.utils.DeleteDir;
     public class TestBench {
     	HashMap<String, Test> tests = new HashMap<String, Test>();
     	private File dir;
     	public TestBench(File dir) {
     		this.dir = dir;
     		if (dir.exists()) {
     			for (File testDir : dir.listFiles()) {
     				if (new File(testDir, "create.groovy").exists()) {
     					String name = testDir.getName();
     					tests.put(name, new Test(dir, name));
+    				}
+    			}
+    		}
+    	}
     	public HashMap<String, Test> getTests() {
     		return tests;
+    	}
     	public Test getTest(String name) {
     		return tests.get(name);
+    	}
     	public Test newTest(String name) {
     		File testDir = new File(dir, name);
     		testDir.mkdir();
     		File create = new File(testDir, "create.groovy");
     		try {
     			create.createNewFile();
     		} catch (IOException e) {
     			e.printStackTrace();
     			return null;
+    		}
     		tests.put(name, new Test(dir, name));
     		return tests.get(name);
+    	}
     	public Test deleteTest(String name) {
     		File testDir = new File(dir, name);
     		DeleteDir.deleteDirectory(testDir);
     		return tests.remove(name);
+    	}
+    }

     package org.txm.scripts.macro.tests
     import java.io.File
     import org.kohsuke.args4j.*
     import groovy.transform.Field
     import org.txm.rcp.swt.widget.parameters.*
     import org.txm.Toolbox
     import org.txm.rcp.commands.tests.*
     @Field @Option(name="name", usage="The test name to create", widget="String", required=true, def="test1")
     String name
     // Open the parameters input dialog box
     if (!ParametersDialog.open(this)) return;
     TestBench bench = GroovyTestBench.getTests();
     Test test = bench.getTest(name)
     if (test != null) {
     	println "Already created."
     } else {
     	bench.newTest(name)
+    }

     package org.txm.scripts.macro.tests
     import java.io.File
     import org.kohsuke.args4j.*
     import groovy.transform.Field
     import org.txm.rcp.swt.widget.parameters.*
     import org.txm.Toolbox
     import org.txm.rcp.commands.tests.*
     @Field @Option(name="step", usage="step to execute, 0=all 1=export&test 2=test", widget="Integer", required=true, def="0")
     int step
     // Open the parameters input dialog box
     if (!ParametersDialog.open(this)) return;
     if (step < 0) step = 0;
     if (step > 3) step = 2;
     TestBench bench = GroovyTestBench.getTests();
     for (Test test : bench.getTests().values()) {
     	test.reset();
+    }

     package org.txm.scripts.macro.tests
     import java.io.File
     import org.kohsuke.args4j.*
     import groovy.transform.Field
     import org.txm.rcp.swt.widget.parameters.*
     import org.txm.Toolbox
     import org.txm.rcp.commands.tests.*
     @Field @Option(name="step", usage="step to execute, 0=all 1=export&test 2=test", widget="Integer", required=true, def="0")
     int step
     // Open the parameters input dialog box
     if (!ParametersDialog.open(this)) return;
     if (step < 0) step = 0;
     if (step > 3) step = 2;
     TestBench bench = GroovyTestBench.getTests();
     for (Test test : bench.getTests().values()) {
     	String name = test.getName()
     	if (test.run(step)) {
     		println "$name -> OK"
     	} else {
     		println "$name -> KO"
+    	}
+    }

     package org.txm.scripts.macro.tests
     import java.io.File
     import org.kohsuke.args4j.*
     import groovy.transform.Field
     import org.txm.rcp.swt.widget.parameters.*
     import org.txm.Toolbox
     import org.txm.rcp.commands.tests.*
     @Field @Option(name="name", usage="The test name to delete", widget="String", required=true, def="test1")
     String name
     // Open the parameters input dialog box
     if (!ParametersDialog.open(this)) return;
     TestBench bench = GroovyTestBench.getTests();
     Test test = bench.getTest(name)
     if (test != null) {
     	bench.deleteTest(test.getName())
     } else {
     	println "No test with name=$name to delete."
+    }

     package org.txm.scripts.macro.tests
     import org.txm.Toolbox
     import org.txm.rcp.commands.tests.TestBench
     /**
      * Stores the Tests results
+     *
      * @author mdecorde
+     *
      */
     public class GroovyTestBench {
     	private static TestBench bench = null;
     	public TestBench getTests() {
     		if (bench != null) return bench;
     		File dir = new File(Toolbox.getTxmHomePath(), "scripts/groovy/user/org/txm/scripts/tests");
     		dir.mkdirs();
     		bench = new TestBench(dir);
     		return bench;
+    	}
+    }

     package org.txm.scripts.macro.tests
     import java.io.File
     import org.kohsuke.args4j.*
     import groovy.transform.Field
     import org.txm.rcp.swt.widget.parameters.*
     import org.txm.Toolbox
     import org.txm.rcp.commands.tests.*
     @Field @Option(name="name", usage="The test name to run", widget="String", required=true, def="test1")
     String name
     @Field @Option(name="step", usage="step to execute, 0=all 1=export&test 2=test", widget="Integer", required=true, def="0")
     int step
     // Open the parameters input dialog box
     if (!ParametersDialog.open(this)) return;
     if (step < 0) step = 0;
     if (step > 3) step = 2;
     TestBench bench = GroovyTestBench.getTests();
     Test test = bench.getTest(name)
     if (test.run(step)) {
     	println "$name -> OK see "+test.getLogs()
     } else {
     	println "$name -> KO see "+test.getLogs()
+    }

     package org.txm.scripts.tests.test1
     import java.util.Calendar
     import java.util.Locale
     import org.txm.*
     import org.txm.core.results.TXMResult
     import org.txm.objects.*
     import org.txm.searchengine.cqp.corpus.MainCorpus
     import org.txm.utils.Diff
     import org.txm.properties.core.functions.*
     try {
     	println outdir
     } catch(Exception e) {return false;}
     File previous_export = new File(outdir, "079.txt")
     File export = new File(outdir, "080.txt")
     if (previous_export.exists() && export.exists()) {
     	return false;
+    }
     String diff = Diff.diffFile(previous_export, export)
     return diff.length() == 0;

     package org.txm.scripts.tests.test1
     import java.util.Calendar
     import java.util.Locale
     import org.txm.*
     import org.txm.core.results.TXMResult
     import org.txm.objects.*
     import org.txm.searchengine.cqp.corpus.MainCorpus
     import org.txm.properties.core.functions.*
     try {
     	println outdir
     	println results
     } catch(Exception e) {return false;}
     Project p = results["project"]
     MainCorpus c = results["corpus"]
     Properties props = results["properties"]
     File outfile = new File(outdir, "080.txt")
     outfile.delete()
     props.toTxt(outfile)
     return outfile.exists()

     package org.txm.scripts.tests.test1
     import java.util.Calendar
     import java.util.Locale
     import org.txm.*
     import org.txm.core.results.TXMResult
     import org.txm.objects.*
     import org.txm.searchengine.cqp.corpus.MainCorpus
     import org.txm.properties.core.functions.*
     Workspace w = Toolbox.workspace
     Project p = w.getProject("NANOBROWN")
     if (p != null) {
     	p.delete();
+    }
     p = new Project(w, "NANOBROWN", true)
     p.setSourceDirectory("")
     p.setDescription("Test1 corpus");
     p.setLang("en");
     p.setImportModuleName("xtz")
     if (!p.compute()) {
     	return false;
+    }
     MainCorpus c = p.getCorpusBuild("NANOBROWN")
     if (c == null) {
     	return false;
+    }
     Properties props = new Properties(c)
     if (!props.compute()) {
     	return false
+    }
     return ["project":p, "corpus":c, "properties":props]

tmp/org.txm.core.tests/.settings/org.eclipse.jdt.groovy.core.prefs (revision 1626)
	1	eclipse.preferences.version=1
	2	groovy.compiler.level=25
	3	groovy.script.filters=*/.dsld,y,*/.gradle,n
0	4

tmp/org.txm.core.tests/.classpath (revision 1626)
7	7	</accessrules>
8	8	</classpathentry>
9	9	<classpathentry kind="src" path="src"/>
	10	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
10	11	<classpathentry kind="output" path="bin"/>
11	12	</classpath>

     Manifest-Version: 1.0
     Bundle-ManifestVersion: 2
     Bundle-Name: Core Toolbox Tests
     Bundle-SymbolicName: org.txm.core.tests;singleton:=true
     Bundle-SymbolicName: org.txm.tests.core;singleton:=true
     Bundle-Version: 1.0.0.qualifier
     Bundle-RequiredExecutionEnvironment: JavaSE-1.7
     Require-Bundle: org.txm.statsengine.r.core;visibility:=reexport,
-...
      org.txm.index.core;bundle-version="1.0.0",
      org.txm.lexicaltable.core;bundle-version="1.0.0",
      org.txm.partition.core;bundle-version="1.0.0",
      org.txm.progression.core;bundle-version="1.0.0",
      org.txm.progression.core;bundle-version="1.0.0";visibility:=reexport,
      org.txm.specificities.core;bundle-version="1.0.0",
      org.txm.referencer.core;bundle-version="1.0.0",
      org.txm.textsbalance.core;bundle-version="1.0.0",
      org.txm.wordcloud.core;bundle-version="1.0.0",
      org.txm.rcp;bundle-version="0.8.0",
      org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,
      org.polarion.eclipse.team.svn.connector.svnkit18;bundle-version="6.0.4",
      org.eclipse.jdt.core;bundle-version="3.13.102"
      org.eclipse.jdt.core;bundle-version="3.13.102",
      org.txm.annotation.kr.core;bundle-version="1.0.0",
      org.txm.chartsengine.svgbatik.rcp;bundle-version="1.0.0",
      org.txm.internalview.core;bundle-version="1.0.0",
      org.txm.properties.core;bundle-version="1.0.0",
      org.txm.searchengine.cqp.rcp;bundle-version="1.0.0"
     Export-Package: org.txm.core.tests.junit,
      org.txm.core.tests.manual,
      org.txm.rcp.commands.tests

     <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
     	<name>org.txm.core.tests</name>
     	<name>org.txm.tests.core</name>
     	<comment></comment>
     	<projects>
     	</projects>
-...
     		</buildCommand>
     	</buildSpec>
     	<natures>
     		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
     		<nature>org.eclipse.pde.PluginNature</nature>
     		<nature>org.eclipse.jdt.core.javanature</nature>
     	</natures>

     descriptionOf=Propriétés de
     error=** Erreur
     error_failedToAccessLexiconOfCorpusP0=** Échec de l''accès au lexique du corpus {0}.
     error_failedToAccessPropertieOfCorpusP0=** Échec de l''accès aux propriétés du corpus {0}.
     error_failedToAccessPropertieOfCorpusP0=** ** Impossible d'accéder aux propriétés du corpus {0}.
     error_failedToAccessStructuresOfCorpusP0=** Échec de l''accès aux structures du corpus {0}.
     generalStatistics=* Statistiques Générales\n
     generalStatistics_2=Statistiques Générales

tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editor/AnnotationExtension.java (revision 1626)
66	66	return o1.getAttribute("position").compareTo(o2.getAttribute("position"));
67	67	}
68	68	});
69
70	69
71	70	ArrayList<String> modes = new ArrayList<String>();
72	71	ArrayList<SelectionListener> listeners = new ArrayList<SelectionListener>();

+    				}
     			} catch(Throwable e) {
     				//errors.add(ext);
     				System.out.println("Error during editor extension notify: "+e);
     				e.printStackTrace();
     				Log.warning("Can't notify of "+step+" the \"+ext+\" extension: "+e);
     				Log.printStackTrace(e);
+    			}
     			//				}
     			//			};

     public class DropdownSelectionListener extends SelectionAdapter {
     		private Menu menu;
     		private SelectionListener defaultListener;
     		public DropdownSelectionListener(ToolItem dropdown) {
     			menu = new Menu(dropdown.getDisplay().getActiveShell(), SWT.POP_UP);
+    		}
     	private Menu menu;
     	private SelectionListener defaultListener;
     	public DropdownSelectionListener(ToolItem dropdown) {
     		menu = new Menu(dropdown.getDisplay().getActiveShell(), SWT.POP_UP);
+    	}
     		public void setDefaultSelectionListener(SelectionListener defaultListener) {
     			this.defaultListener = defaultListener;
+    		}
     	public void setDefaultSelectionListener(SelectionListener defaultListener) {
     		this.defaultListener = defaultListener;
+    	}
     		public Menu getMenu() {
     			return menu;
+    		}
     	public Menu getMenu() {
     		return menu;
+    	}
     		public void widgetSelected(SelectionEvent event) {
     			if (event.detail == SWT.ARROW) {
     				ToolItem item = (ToolItem) event.widget;
     				Rectangle rect = item.getBounds();
     				Point pt = item.getParent().toDisplay(new Point(rect.x, rect.y));
     				menu.setLocation(pt.x, pt.y + rect.height);
     				menu.setVisible(true);
     				event.doit = false;
     			} else {
     				defaultListener.widgetSelected(event);
+    			}
     	public void widgetSelected(SelectionEvent event) {
     		if (event.detail == SWT.ARROW) {
     			ToolItem item = (ToolItem) event.widget;
     			Rectangle rect = item.getBounds();
     			Point pt = item.getParent().toDisplay(new Point(rect.x, rect.y));
     			menu.setLocation(pt.x, pt.y + rect.height);
     			menu.setVisible(true);
     			event.doit = false;
     		} else {
     			defaultListener.widgetSelected(event);
+    		}
+    	}
+    	}
+    }

     		// TXM-0.8.0 previous installation corpora
     		if (corporaDir.listFiles(IOUtils.HIDDENFILE_FILTER).length > 0) { // not a new install, restore previous corpora
     			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, corporaDir));
     			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, "0.8.0", corporaDir));
     			JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(corporaDir, false, true, true);
     			try {
     				job.join();
     			} catch (InterruptedException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
+    			}
+    		}
     		// TXM previous installation corpora
     		if (previousCorporaDirectory.exists()) { // new installation (empty corpora directory)
     			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, previousCorporaDirectory));
     			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, "0.7.9", previousCorporaDirectory));
     			JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(previousCorporaDirectory, false, false, true);
     			try {
     				job.join();
     			} catch (InterruptedException e) {
     				// TODO Auto-generated catch block
     				e.printStackTrace();
+    			}
+    		}

     h = h,
     iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpColontextometrieenslyonfrspipphprubrique61SupPage = J'accepte la licence et je m'engage à citer TXM dans mes travaux de recherche \n(voir la section 'Citation de TXM' de la page <http://textometrie.ens-lyon.fr/spip.php?rubrique61>)
     iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpColontextometrieenslyonfrspipphprubrique61SupPage = J'accepte la licence et je m'engage à citer TXM dans mes publications \n(voir la section 'Citer TXM' de la page <http://textometrie.ens-lyon.fr/spip.php?rubrique61> de Téléchargement)
     identifiedLanguage = Langue identifiée : {0}.
-...
     tXMiniColon = TXM.ini :
     termsOfService = Licence d'utilisation
     termsOfService = Veuillez    accepter la licence d'utilisation
     textEditorColonP0EncodingFoundP1 = Editeur de Texte: l'encodage de {0} est {1}
-...
     zoomToSelectionColonCtrlPlusLeftMousePlusdrag = \	Zoomer sur la sélection : Ctrl + Clic Gauche + Glisser\n
     P0CorpusLoaded={0} corpus chargées.
     P0CorpusLoaded={0} corpus chargé(s).
     installingPreviousCorpusFromP0=Installation des corpus précédents depuis le répertoire {0}.
     installingPreviousCorpusFromP0=Récupération des corpus préexistants de TXM {0} (depuis le répertoire {1})...
     theP0directoryNotABinaryCorpus=Le répertoire {0} n'est pas un corpus binaire.

     	private static final String BUNDLE_NAME = "org.txm.rcp.messages.messages"; //$NON-NLS-1$
     	public static String theP0directoryNotABinaryCorpus;
     	public static String P0CorpusLoaded;
     	public static String EMPTY;

     tXMiniColon = TXM.ini:
     termsOfService = Terms of service
     termsOfService = Please accept the terms of service
     textEditorColonP0EncodingFoundP1 = Text editor: {0} encoding is {1}
-...
     P0CorpusLoaded={0} corpus loaded.
     installingPreviousCorpusFromP0=Installing previous corpus from the {0} corpora directory.
     installingPreviousCorpusFromP0=Restoring previous TXM {0} corpora (from the {0} directory)...
     theP0directoryNotABinaryCorpus=The {0} directory is not a binary corpus.

     				Project project = Toolbox.workspace.getProject(corpusDirectory.getName().toUpperCase());
     				if (project != null) {
     					Log.warning("A corpus named "+corpusDirectory.getName().toUpperCase()+" is already loaded. Aborting the loading of "+corpusDirectory);
     					Log.warning("A corpus named "+corpusDirectory.getName().toUpperCase()+" is already exists, abandoning the loading of "+corpusDirectory);
     					continue;
+    				}
-...
     //				Project base = LoadBinaryCorpus.loadBinaryCorpusAsDirectory(corpusDirectory);
     				if (project == null) {
     					Log.warning("Failed to load binary corpus: "+corpusDirectory);
     					//Log.warning("Failed to load binary corpus: "+corpusDirectory);
     				} else {
     					projects.add(project);
+    				}

     		File importXMLFile = new File(destDir, "import.xml");
     		File dotProjectFile = new File(destDir, ".project");
     		if (paramFile.exists() && paramFile.isDirectory() && dotProjectFile.exists() && dotProjectFile.isFile()) {
     			System.out.println(NLS.bind(TXMUIMessages.loadingTheP0BinaryCorpusAsATXM080Corpus, destDir));
     			Log.info(NLS.bind(TXMUIMessages.loadingTheP0BinaryCorpusAsATXM080Corpus, destDir));
     			project = Load080BinaryCorpus.loadBinaryCorpusAsDirectory(destDir);
     		} else if (importXMLFile.exists()) {
     			System.out.println(NLS.bind(TXMUIMessages.loadingTheP0BinaryCorpusAsATXM079Corpus, destDir));
     			Log.info(NLS.bind(TXMUIMessages.loadingTheP0BinaryCorpusAsATXM079Corpus, destDir));
     			project = Load079BinaryCorpus.loadBinaryCorpusAsDirectory(destDir, null);
     		} else {
     			Log.severe(NLS.bind("Error: {0} is not a binary corpus directory.", destDir));
     			Log.warning(NLS.bind(TXMUIMessages.theP0directoryNotABinaryCorpus, destDir));
+    		}
     		if (!destDir.equals(corpusDirectory) && project == null) { // clean if necessary

tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1626)
296	296	retrievedParent.addChild(this);
297	297	}
298	298	else {
299		Log.severe("Warning: no parent was found in project for path=" + parametersNodePath + " and puuid=" + parentNodePath + " preferences=" + this.dumpParameters()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
300		// FIXME: commented for now
301		//TBXPreferences.delete(this);
	299	Log.warning("Warning: no parent was found in project for path=" + parametersNodePath + " and puuid=" + parentNodePath + " preferences=" + this.dumpParameters()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
	300	try {TBXPreferences.delete(this);} catch(Exception e) {}
302	301	return;
303	302	}
304	303	}
...	...
308	307	this.autoLoadParametersFromAnnotations(); // auto fill from Parameter annotations
309	308	this.loadParameters(); // subclasses manual settings
310	309	} catch (Exception e) {
311		Log.severe("Fail to load " + parametersNodePath + "result: " + e); //$NON-NLS-1$ //$NON-NLS-2$
	310	Log.warning("Fail to load " + parametersNodePath + "result: " + e); //$NON-NLS-1$ //$NON-NLS-2$
312	311	Log.printStackTrace(e);
313	312	}
314	313

     		Log.fine("Loading " + resultNodePaths.size() + " result(s) from project " + this.getName() + "...");
     		ArrayList<String> errors = new ArrayList<String>();
     		for (String parametersNodePath : resultNodePaths) {
     			// skip non-TXMResult preference node
-...
+    				}
     				if (className == null || className.length() == 0) {
     					Log.warning(NLS.bind("Warning: can not restore object with no class name set with path={0}.", parametersNodePath)); //$NON-NLS-1$
     					errors.add(NLS.bind("Warning: can not restore object with no class name set with path={0}.", parametersNodePath)); //$NON-NLS-1$
     					node.removeNode();
     					continue;
+    				}
-...
     				Log.fine("Project.loadResults(): parent_uuid = " + node.get(TXMPreferences.PARENT_PARAMETERS_NODE_PATH, "")); //$NON-NLS-1$
     				String bundleId = node.get(TXMPreferences.BUNDLE_ID, ""); //$NON-NLS-1$
     				if (bundleId == null || bundleId.length() == 0) {
     					Log.warning(NLS.bind("Warning: can not restore {0} object with no bundle id set.", className)); //$NON-NLS-1$
     					errors.add(NLS.bind("Warning: can not restore {0} object with no bundle id set.", className)); //$NON-NLS-1$
     					node.removeNode();
     					continue;
+    				}
     				Log.fine("Project.loadResults(): bundle_id = " + bundleId); //$NON-NLS-1$
     				Bundle bundle = Platform.getBundle(bundleId);
     				if (bundle == null) {
     					Log.warning(NLS.bind("Warning: can not restore {0} object with bundle id={1}.", className, bundleId)); //$NON-NLS-1$
     					errors.add(NLS.bind("Warning: can not restore {0} object with bundle id={1}.", className, bundleId)); //$NON-NLS-1$
     					node.removeNode();
     					continue;
+    				}
-...
     				e.printStackTrace();
+    			}
+    		}
     		if (errors.size() > 0) {
     			for (int i = 0 ; i < 20 && i < errors.size() ; i++) {
     				Log.warning(errors.get(i));
+    			}
     			if (errors.size() > 20) {
     				Log.warning("more: "+(errors.size()-20)+"...");
+    			}
+    		}
+    	}
     	//	public BasePreferenceScope getPreferenceScope() {
-...
     				if (className == null || className.length() == 0) {
     					Log.warning(NLS.bind("Warning: can not restore object with no class name set with path={0}.", parametersNodePath)); //$NON-NLS-1$
     					node.removeNode();
     					continue;
+    				}
-...
     				Bundle bundle = Platform.getBundle(bundleId);
     				if (bundle == null) {
     					Log.finest("Warning: can not restore object with bundle name " + bundleId); //$NON-NLS-1$
     					node.removeNode();
     					continue;
+    				}
-...
+    	}
     	public String toString() {
     		return this.userName+" "+this.rcpProject.getLocation();
     		return this.userName+((this.rcpProject != null && this.rcpProject.getLocation() != null)?" ("+this.rcpProject.getLocation()+")":"");
+    	}
     	public List<String> getBuiltEditionNames() {

Laboratoire ICAR » Plateforme TXM

Révision 1626