Révision 671

tmp/org.txm.treetaggerinstaller.rcp/src/org/txm/treetagger/DoInstallStep.java (revision 671)
109 109
		Log.warning("TreeTagger preferences set to: "+ttdir+ " and "+ttmodeldir);
110 110
		TXMPreferences.put(TreeTaggerInstallerPreferences.PREFERENCES_NODE, TreeTaggerInstallerPreferences.VERSION, currentVersion.toString());
111 111
		
112
		//TODO: to beremoved when 0.7.9 preferences are ready 
112
		//TODO: to beremoved when 0.8.0 preferences are ready 
113 113
		TXMPreferences.put(TBXPreferences.PREFERENCES_NODE, TBXPreferences.TREETAGGER_INSTALL_PATH, ttdir);
114 114
		TXMPreferences.put(TBXPreferences.PREFERENCES_NODE, TBXPreferences.TREETAGGER_MODELS_PATH, ttmodeldir);
115 115
	}
tmp/org.txm.treetaggerinstaller.rcp/TreeTagger/linux32/doc/sigdat95.ps (revision 671)
1826 1826
/col7 {1.000 1.000 1.000 srgb} bind def
1827 1827
/col8 {0.000 0.000 0.560 srgb} bind def
1828 1828
/col9 {0.000 0.000 0.690 srgb} bind def
1829
/col10 {0.000 0.000 0.820 srgb} bind def
1830
/col11 {0.530 0.810 1.000 srgb} bind def
1829
/col10 {0.000 0.000 0.8.020 srgb} bind def
1830
/col11 {0.530 0.8.010 1.000 srgb} bind def
1831 1831
/col12 {0.000 0.560 0.000 srgb} bind def
1832 1832
/col13 {0.000 0.690 0.000 srgb} bind def
1833
/col14 {0.000 0.820 0.000 srgb} bind def
1833
/col14 {0.000 0.8.020 0.000 srgb} bind def
1834 1834
/col15 {0.000 0.560 0.560 srgb} bind def
1835 1835
/col16 {0.000 0.690 0.690 srgb} bind def
1836
/col17 {0.000 0.820 0.820 srgb} bind def
1836
/col17 {0.000 0.8.020 0.8.020 srgb} bind def
1837 1837
/col18 {0.560 0.000 0.000 srgb} bind def
1838 1838
/col19 {0.690 0.000 0.000 srgb} bind def
1839
/col20 {0.820 0.000 0.000 srgb} bind def
1839
/col20 {0.8.020 0.000 0.000 srgb} bind def
1840 1840
/col21 {0.560 0.000 0.560 srgb} bind def
1841 1841
/col22 {0.690 0.000 0.690 srgb} bind def
1842
/col23 {0.820 0.000 0.820 srgb} bind def
1842
/col23 {0.8.020 0.000 0.8.020 srgb} bind def
1843 1843
/col24 {0.500 0.190 0.000 srgb} bind def
1844 1844
/col25 {0.630 0.250 0.000 srgb} bind def
1845 1845
/col26 {0.750 0.380 0.000 srgb} bind def
1846 1846
/col27 {1.000 0.500 0.500 srgb} bind def
1847 1847
/col28 {1.000 0.630 0.630 srgb} bind def
1848 1848
/col29 {1.000 0.750 0.750 srgb} bind def
1849
/col30 {1.000 0.880 0.880 srgb} bind def
1850
/col31 {1.000 0.840 0.000 srgb} bind def
1849
/col30 {1.000 0.8.080 0.8.080 srgb} bind def
1850
/col31 {1.000 0.8.040 0.000 srgb} bind def
1851 1851

  
1852 1852
end
1853 1853
save
......
2065 2065
/col7 {1.000 1.000 1.000 srgb} bind def
2066 2066
/col8 {0.000 0.000 0.560 srgb} bind def
2067 2067
/col9 {0.000 0.000 0.690 srgb} bind def
2068
/col10 {0.000 0.000 0.820 srgb} bind def
2069
/col11 {0.530 0.810 1.000 srgb} bind def
2068
/col10 {0.000 0.000 0.8.020 srgb} bind def
2069
/col11 {0.530 0.8.010 1.000 srgb} bind def
2070 2070
/col12 {0.000 0.560 0.000 srgb} bind def
2071 2071
/col13 {0.000 0.690 0.000 srgb} bind def
2072
/col14 {0.000 0.820 0.000 srgb} bind def
2072
/col14 {0.000 0.8.020 0.000 srgb} bind def
2073 2073
/col15 {0.000 0.560 0.560 srgb} bind def
2074 2074
/col16 {0.000 0.690 0.690 srgb} bind def
2075
/col17 {0.000 0.820 0.820 srgb} bind def
2075
/col17 {0.000 0.8.020 0.8.020 srgb} bind def
2076 2076
/col18 {0.560 0.000 0.000 srgb} bind def
2077 2077
/col19 {0.690 0.000 0.000 srgb} bind def
2078
/col20 {0.820 0.000 0.000 srgb} bind def
2078
/col20 {0.8.020 0.000 0.000 srgb} bind def
2079 2079
/col21 {0.560 0.000 0.560 srgb} bind def
2080 2080
/col22 {0.690 0.000 0.690 srgb} bind def
2081
/col23 {0.820 0.000 0.820 srgb} bind def
2081
/col23 {0.8.020 0.000 0.8.020 srgb} bind def
2082 2082
/col24 {0.500 0.190 0.000 srgb} bind def
2083 2083
/col25 {0.630 0.250 0.000 srgb} bind def
2084 2084
/col26 {0.750 0.380 0.000 srgb} bind def
2085 2085
/col27 {1.000 0.500 0.500 srgb} bind def
2086 2086
/col28 {1.000 0.630 0.630 srgb} bind def
2087 2087
/col29 {1.000 0.750 0.750 srgb} bind def
2088
/col30 {1.000 0.880 0.880 srgb} bind def
2089
/col31 {1.000 0.840 0.000 srgb} bind def
2088
/col30 {1.000 0.8.080 0.8.080 srgb} bind def
2089
/col31 {1.000 0.8.040 0.000 srgb} bind def
2090 2090

  
2091 2091
end
2092 2092
save
......
2400 2400
gs 1 -1 sc (ty    \(NN:0.45, JJ:0.35, NP:0.2\)) col-1 sh gr
2401 2401
/Times-Roman ff 600.00 scf sf
2402 2402
6870 9945 m
2403
gs 1 -1 sc (son  \(NP:0.8, NN:0.1, JJ:0.1\)) col-1 sh gr
2403
gs 1 -1 sc (son  \(NP:0.8.0, NN:0.1, JJ:0.1\)) col-1 sh gr
2404 2404
/Times-Roman ff 600.00 scf sf
2405 2405
6840 11550 m
2406
gs 1 -1 sc (man \(NP:0.8, NN:0.2\)) col-1 sh gr
2406
gs 1 -1 sc (man \(NP:0.8.0, NN:0.2\)) col-1 sh gr
2407 2407
/Times-Roman ff 600.00 scf sf
2408 2408
6870 10725 m
2409 2409
gs 1 -1 sc (ton  \(NP:0.9, NN:0.05, JJ:0.05\)) col-1 sh gr
tmp/org.txm.treetaggerinstaller.rcp/TreeTagger/linux64/doc/sigdat95.ps (revision 671)
1826 1826
/col7 {1.000 1.000 1.000 srgb} bind def
1827 1827
/col8 {0.000 0.000 0.560 srgb} bind def
1828 1828
/col9 {0.000 0.000 0.690 srgb} bind def
1829
/col10 {0.000 0.000 0.820 srgb} bind def
1830
/col11 {0.530 0.810 1.000 srgb} bind def
1829
/col10 {0.000 0.000 0.8.020 srgb} bind def
1830
/col11 {0.530 0.8.010 1.000 srgb} bind def
1831 1831
/col12 {0.000 0.560 0.000 srgb} bind def
1832 1832
/col13 {0.000 0.690 0.000 srgb} bind def
1833
/col14 {0.000 0.820 0.000 srgb} bind def
1833
/col14 {0.000 0.8.020 0.000 srgb} bind def
1834 1834
/col15 {0.000 0.560 0.560 srgb} bind def
1835 1835
/col16 {0.000 0.690 0.690 srgb} bind def
1836
/col17 {0.000 0.820 0.820 srgb} bind def
1836
/col17 {0.000 0.8.020 0.8.020 srgb} bind def
1837 1837
/col18 {0.560 0.000 0.000 srgb} bind def
1838 1838
/col19 {0.690 0.000 0.000 srgb} bind def
1839
/col20 {0.820 0.000 0.000 srgb} bind def
1839
/col20 {0.8.020 0.000 0.000 srgb} bind def
1840 1840
/col21 {0.560 0.000 0.560 srgb} bind def
1841 1841
/col22 {0.690 0.000 0.690 srgb} bind def
1842
/col23 {0.820 0.000 0.820 srgb} bind def
1842
/col23 {0.8.020 0.000 0.8.020 srgb} bind def
1843 1843
/col24 {0.500 0.190 0.000 srgb} bind def
1844 1844
/col25 {0.630 0.250 0.000 srgb} bind def
1845 1845
/col26 {0.750 0.380 0.000 srgb} bind def
1846 1846
/col27 {1.000 0.500 0.500 srgb} bind def
1847 1847
/col28 {1.000 0.630 0.630 srgb} bind def
1848 1848
/col29 {1.000 0.750 0.750 srgb} bind def
1849
/col30 {1.000 0.880 0.880 srgb} bind def
1850
/col31 {1.000 0.840 0.000 srgb} bind def
1849
/col30 {1.000 0.8.080 0.8.080 srgb} bind def
1850
/col31 {1.000 0.8.040 0.000 srgb} bind def
1851 1851

  
1852 1852
end
1853 1853
save
......
2065 2065
/col7 {1.000 1.000 1.000 srgb} bind def
2066 2066
/col8 {0.000 0.000 0.560 srgb} bind def
2067 2067
/col9 {0.000 0.000 0.690 srgb} bind def
2068
/col10 {0.000 0.000 0.820 srgb} bind def
2069
/col11 {0.530 0.810 1.000 srgb} bind def
2068
/col10 {0.000 0.000 0.8.020 srgb} bind def
2069
/col11 {0.530 0.8.010 1.000 srgb} bind def
2070 2070
/col12 {0.000 0.560 0.000 srgb} bind def
2071 2071
/col13 {0.000 0.690 0.000 srgb} bind def
2072
/col14 {0.000 0.820 0.000 srgb} bind def
2072
/col14 {0.000 0.8.020 0.000 srgb} bind def
2073 2073
/col15 {0.000 0.560 0.560 srgb} bind def
2074 2074
/col16 {0.000 0.690 0.690 srgb} bind def
2075
/col17 {0.000 0.820 0.820 srgb} bind def
2075
/col17 {0.000 0.8.020 0.8.020 srgb} bind def
2076 2076
/col18 {0.560 0.000 0.000 srgb} bind def
2077 2077
/col19 {0.690 0.000 0.000 srgb} bind def
2078
/col20 {0.820 0.000 0.000 srgb} bind def
2078
/col20 {0.8.020 0.000 0.000 srgb} bind def
2079 2079
/col21 {0.560 0.000 0.560 srgb} bind def
2080 2080
/col22 {0.690 0.000 0.690 srgb} bind def
2081
/col23 {0.820 0.000 0.820 srgb} bind def
2081
/col23 {0.8.020 0.000 0.8.020 srgb} bind def
2082 2082
/col24 {0.500 0.190 0.000 srgb} bind def
2083 2083
/col25 {0.630 0.250 0.000 srgb} bind def
2084 2084
/col26 {0.750 0.380 0.000 srgb} bind def
2085 2085
/col27 {1.000 0.500 0.500 srgb} bind def
2086 2086
/col28 {1.000 0.630 0.630 srgb} bind def
2087 2087
/col29 {1.000 0.750 0.750 srgb} bind def
2088
/col30 {1.000 0.880 0.880 srgb} bind def
2089
/col31 {1.000 0.840 0.000 srgb} bind def
2088
/col30 {1.000 0.8.080 0.8.080 srgb} bind def
2089
/col31 {1.000 0.8.040 0.000 srgb} bind def
2090 2090

  
2091 2091
end
2092 2092
save
......
2400 2400
gs 1 -1 sc (ty    \(NN:0.45, JJ:0.35, NP:0.2\)) col-1 sh gr
2401 2401
/Times-Roman ff 600.00 scf sf
2402 2402
6870 9945 m
2403
gs 1 -1 sc (son  \(NP:0.8, NN:0.1, JJ:0.1\)) col-1 sh gr
2403
gs 1 -1 sc (son  \(NP:0.8.0, NN:0.1, JJ:0.1\)) col-1 sh gr
2404 2404
/Times-Roman ff 600.00 scf sf
2405 2405
6840 11550 m
2406
gs 1 -1 sc (man \(NP:0.8, NN:0.2\)) col-1 sh gr
2406
gs 1 -1 sc (man \(NP:0.8.0, NN:0.2\)) col-1 sh gr
2407 2407
/Times-Roman ff 600.00 scf sf
2408 2408
6870 10725 m
2409 2409
gs 1 -1 sc (ton  \(NP:0.9, NN:0.05, JJ:0.05\)) col-1 sh gr
tmp/org.txm.treetaggerinstaller.rcp/TreeTagger/macosx/doc/sigdat95.ps (revision 671)
1826 1826
/col7 {1.000 1.000 1.000 srgb} bind def
1827 1827
/col8 {0.000 0.000 0.560 srgb} bind def
1828 1828
/col9 {0.000 0.000 0.690 srgb} bind def
1829
/col10 {0.000 0.000 0.820 srgb} bind def
1830
/col11 {0.530 0.810 1.000 srgb} bind def
1829
/col10 {0.000 0.000 0.8.020 srgb} bind def
1830
/col11 {0.530 0.8.010 1.000 srgb} bind def
1831 1831
/col12 {0.000 0.560 0.000 srgb} bind def
1832 1832
/col13 {0.000 0.690 0.000 srgb} bind def
1833
/col14 {0.000 0.820 0.000 srgb} bind def
1833
/col14 {0.000 0.8.020 0.000 srgb} bind def
1834 1834
/col15 {0.000 0.560 0.560 srgb} bind def
1835 1835
/col16 {0.000 0.690 0.690 srgb} bind def
1836
/col17 {0.000 0.820 0.820 srgb} bind def
1836
/col17 {0.000 0.8.020 0.8.020 srgb} bind def
1837 1837
/col18 {0.560 0.000 0.000 srgb} bind def
1838 1838
/col19 {0.690 0.000 0.000 srgb} bind def
1839
/col20 {0.820 0.000 0.000 srgb} bind def
1839
/col20 {0.8.020 0.000 0.000 srgb} bind def
1840 1840
/col21 {0.560 0.000 0.560 srgb} bind def
1841 1841
/col22 {0.690 0.000 0.690 srgb} bind def
1842
/col23 {0.820 0.000 0.820 srgb} bind def
1842
/col23 {0.8.020 0.000 0.8.020 srgb} bind def
1843 1843
/col24 {0.500 0.190 0.000 srgb} bind def
1844 1844
/col25 {0.630 0.250 0.000 srgb} bind def
1845 1845
/col26 {0.750 0.380 0.000 srgb} bind def
1846 1846
/col27 {1.000 0.500 0.500 srgb} bind def
1847 1847
/col28 {1.000 0.630 0.630 srgb} bind def
1848 1848
/col29 {1.000 0.750 0.750 srgb} bind def
1849
/col30 {1.000 0.880 0.880 srgb} bind def
1850
/col31 {1.000 0.840 0.000 srgb} bind def
1849
/col30 {1.000 0.8.080 0.8.080 srgb} bind def
1850
/col31 {1.000 0.8.040 0.000 srgb} bind def
1851 1851

  
1852 1852
end
1853 1853
save
......
2065 2065
/col7 {1.000 1.000 1.000 srgb} bind def
2066 2066
/col8 {0.000 0.000 0.560 srgb} bind def
2067 2067
/col9 {0.000 0.000 0.690 srgb} bind def
2068
/col10 {0.000 0.000 0.820 srgb} bind def
2069
/col11 {0.530 0.810 1.000 srgb} bind def
2068
/col10 {0.000 0.000 0.8.020 srgb} bind def
2069
/col11 {0.530 0.8.010 1.000 srgb} bind def
2070 2070
/col12 {0.000 0.560 0.000 srgb} bind def
2071 2071
/col13 {0.000 0.690 0.000 srgb} bind def
2072
/col14 {0.000 0.820 0.000 srgb} bind def
2072
/col14 {0.000 0.8.020 0.000 srgb} bind def
2073 2073
/col15 {0.000 0.560 0.560 srgb} bind def
2074 2074
/col16 {0.000 0.690 0.690 srgb} bind def
2075
/col17 {0.000 0.820 0.820 srgb} bind def
2075
/col17 {0.000 0.8.020 0.8.020 srgb} bind def
2076 2076
/col18 {0.560 0.000 0.000 srgb} bind def
2077 2077
/col19 {0.690 0.000 0.000 srgb} bind def
2078
/col20 {0.820 0.000 0.000 srgb} bind def
2078
/col20 {0.8.020 0.000 0.000 srgb} bind def
2079 2079
/col21 {0.560 0.000 0.560 srgb} bind def
2080 2080
/col22 {0.690 0.000 0.690 srgb} bind def
2081
/col23 {0.820 0.000 0.820 srgb} bind def
2081
/col23 {0.8.020 0.000 0.8.020 srgb} bind def
2082 2082
/col24 {0.500 0.190 0.000 srgb} bind def
2083 2083
/col25 {0.630 0.250 0.000 srgb} bind def
2084 2084
/col26 {0.750 0.380 0.000 srgb} bind def
2085 2085
/col27 {1.000 0.500 0.500 srgb} bind def
2086 2086
/col28 {1.000 0.630 0.630 srgb} bind def
2087 2087
/col29 {1.000 0.750 0.750 srgb} bind def
2088
/col30 {1.000 0.880 0.880 srgb} bind def
2089
/col31 {1.000 0.840 0.000 srgb} bind def
2088
/col30 {1.000 0.8.080 0.8.080 srgb} bind def
2089
/col31 {1.000 0.8.040 0.000 srgb} bind def
2090 2090

  
2091 2091
end
2092 2092
save
......
2400 2400
gs 1 -1 sc (ty    \(NN:0.45, JJ:0.35, NP:0.2\)) col-1 sh gr
2401 2401
/Times-Roman ff 600.00 scf sf
2402 2402
6870 9945 m
2403
gs 1 -1 sc (son  \(NP:0.8, NN:0.1, JJ:0.1\)) col-1 sh gr
2403
gs 1 -1 sc (son  \(NP:0.8.0, NN:0.1, JJ:0.1\)) col-1 sh gr
2404 2404
/Times-Roman ff 600.00 scf sf
2405 2405
6840 11550 m
2406
gs 1 -1 sc (man \(NP:0.8, NN:0.2\)) col-1 sh gr
2406
gs 1 -1 sc (man \(NP:0.8.0, NN:0.2\)) col-1 sh gr
2407 2407
/Times-Roman ff 600.00 scf sf
2408 2408
6870 10725 m
2409 2409
gs 1 -1 sc (ton  \(NP:0.9, NN:0.05, JJ:0.05\)) col-1 sh gr
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java (revision 671)
36 36
import org.txm.searchengine.cqp.corpus.Property;
37 37
import org.txm.searchengine.cqp.corpus.StructuralUnit;
38 38
import org.txm.searchengine.cqp.corpus.query.Match;
39
import org.txm.synopticedition.rcp.editors.RGBA;
39 40
import org.txm.synopticedition.rcp.editors.SynopticEditionEditor;
40
import org.txm.synopticedition.rcp.editors.EditionPanel.RGBA;
41 41
import org.txm.synopticedition.rcp.handlers.OpenEdition;
42 42
import org.txm.utils.logger.Log;
43 43

  
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java (revision 671)
82 82
			selection = parameters;
83 83
		}
84 84
		
85
		if (!openEditor(selection)) {
85
		if (openEditor(selection) == null) {
86 86
			System.out.println(Messages.ComputeConcordance_1);
87 87
		}
88 88

  
......
90 90
	}
91 91

  
92 92
	@Inject
93
	public static boolean openEditor(Object o) {
93
	public static IEditorPart openEditor(Object o) {
94 94
		
95 95
		if (!CQPEngine.isInitialized()) {
96 96
			System.out.println("SearchEngine is not ready. Aborting.");
97
			return false;
97
			return null;
98 98
		}
99 99
		
100 100
		Concordance concordance = null;
......
120 120
//			concordance.setParameters(parameters);
121 121
		} else {
122 122
			System.out.println("Could not call ComputeConcordance with: "+o);
123
			return false;
123
			return null;
124 124
		}
125 125
		
126 126
		TXMResultEditorInput editorInput = new TXMResultEditorInput(concordance);
......
128 128
		try {
129 129
			StatusLine.setMessage(Messages.ComputeConcordance_0);
130 130
			IEditorPart editor = TXMWindows.getActiveWindow().getActivePage().openEditor(editorInput, ConcordanceEditor.class.getName()); //$NON-NLS-1$
131
				if (editor == null) return false;
131
				if (editor == null) return null;
132
				
133
			return editor;
132 134
		} catch (PartInitException e) {
133 135
			System.err.println(NLS.bind(Messages.GetConcordances_4, e));
134 136
			e.printStackTrace();
135 137
		}
136
		return true;
138
		return null;
137 139
	}
138 140
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java (revision 671)
236 236
//								DeleteDir.deleteDirectory(backup);
237 237
//							} catch (Exception e) {
238 238
//								System.out.println(Messages.LoadBinaryCorpus_3+e+Messages.LoadBinaryCorpus_7);
239
//								//Toolbox.getCqiClient().dropCorpus(name);
239
//								//CQPEngine.getCqiClient().dropCorpus(name);
240 240
//								//Log.info(NLS.bind(Messages.AddBase_23, basename.toUpperCase())); 
241 241
//								Log.info(Log.toString(e));
242 242
//								//restoreCorpus(backup, corpusdir);
tmp/org.txm.dictionary.rcp/META-INF/MANIFEST.MF (revision 671)
12 12
 org.txm.utils,
13 13
 org.eclipse.persistence.jpa;bundle-version="2.6.0",
14 14
 org.txm.index.core;bundle-version="1.0.0",
15
 org.txm.index.rcp;bundle-version="1.0.0"
15
 org.txm.index.rcp;bundle-version="1.0.0",
16
 javax.persistence,
17
 org.txm.annotation.core
16 18
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
17 19
Bundle-ActivationPolicy: lazy
18 20
Export-Package: dictionary,
tmp/org.txm.dictionary.rcp/src/org/txm/dictionary/functions/jpa/Dictionary.java (revision 671)
16 16
import java.util.HashMap;
17 17
import java.util.HashSet;
18 18
import java.util.List;
19
import java.util.Vector;
20 19
import java.util.logging.Level;
21 20
import java.util.regex.Pattern;
22 21

  
......
25 24
import javax.persistence.FlushModeType;
26 25
import javax.persistence.Query;
27 26

  
27
import org.eclipse.core.runtime.IProgressMonitor;
28 28
import org.eclipse.persistence.config.PersistenceUnitProperties;
29 29
import org.eclipse.persistence.config.QueryHints;
30 30
import org.eclipse.persistence.jpa.PersistenceProvider;
31 31
import org.eclipse.persistence.queries.Cursor;
32 32
import org.txm.Toolbox;
33
import org.txm.annotation.DatabasePersistenceManager;
34
import org.eclipse.core.runtime.IProgressMonitor;
33
import org.txm.annotation.core.DatabasePersistenceManager;
35 34
import org.txm.stat.utils.ConsoleProgressBar;
36 35
import org.txm.utils.logger.Log;
37 36

  
tmp/org.txm.core.tests/src/org/txm/core/tests/manual/ToolBoxTesterRCPApplication.java (revision 671)
77 77
			System.out.println("**************************************************");
78 78
			System.out.println("** Lexicon tests");
79 79
			System.out.println("**************************************************");
80
			Lexicon lex1 = Lexicon.getLexicon(corpus, word);
80
			Lexicon lex1 = new Lexicon(corpus);
81
			lex1.setProperty(word);
82
			lex1.compute();
81 83
			System.out.println("Details: " + lex1.getDetails());
82 84
			
83 85
			//FIXME: end of tests
tmp/org.txm.links.rcp/META-INF/MANIFEST.MF (revision 671)
29 29
 org.txm.cooccurrence.rcp;bundle-version="1.0.0";visibility:=reexport,
30 30
 org.txm.internalview.rcp;bundle-version="1.0.0";visibility:=reexport,
31 31
 org.txm.statsengine.r.rcp;bundle-version="1.0.0";visibility:=reexport,
32
 org.txm.synopticedition.rcp,
33 32
 org.txm.index.rcp,
34 33
 org.txm.progression.rcp,
35 34
 org.txm.lexicaltable.rcp,
36
 org.txm.libs.batik
37
Export-Package: org.txm.synopticedition.rcp.commands.link
35
 org.txm.libs.batik,
36
 org.txm.synopticeditor.rcp;bundle-version="1.0.0"
37
Export-Package: org.txm.links.rcp,
38
 org.txm.rcp.commands.link
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToLexicalTable.java (revision 671)
117 117
		}
118 118
		
119 119
		try {
120
			table = new LexicalTable(voc, QuantitativeDataStructureImpl.createSymbole(LexicalTableImpl.class));
121
		} catch (RWorkspaceException e) {
120
			table = new LexicalTable(voc);
121
		} catch (Exception e) {
122 122
			// TODO Auto-generated catch block
123 123
			org.txm.rcp.utils.Logger.printStackTrace(e);
124 124
			return false;
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToProgression.java (revision 671)
34 34
import org.eclipse.core.commands.ExecutionEvent;
35 35
import org.eclipse.core.commands.ExecutionException;
36 36
import org.eclipse.jface.viewers.IStructuredSelection;
37
import org.eclipse.jface.window.Window;
38
import org.eclipse.swt.widgets.Shell;
39 37
import org.eclipse.ui.IWorkbenchWindow;
40 38
import org.eclipse.ui.handlers.HandlerUtil;
41 39
import org.txm.index.core.functions.Line;
42 40
import org.txm.index.rcp.editors.IndexEditor;
43
import org.txm.progression.rcp.dialogs.___ProgressionDialog;
44
import org.txm.progression.rcp.handlers.ComputeProgression;
41
import org.txm.progression.core.functions.Progression;
42
import org.txm.progression.rcp.editors.ProgressionEditor;
43
import org.txm.rcp.editors.TXMEditor;
45 44
import org.txm.rcp.editors.TXMResultEditorInput;
46 45
import org.txm.searchengine.cqp.corpus.Corpus;
47 46
import org.txm.searchengine.cqp.corpus.Property;
......
80 79
				.getActivePart();
81 80
		Corpus corpus = voceditor.getCorpus();
82 81

  
83
		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event).getShell();
84
		final ___ProgressionDialog d = new ___ProgressionDialog(shell, corpus, queries);
85
		int code = d.open();
86
		if (code == Window.OK) {
87
			ComputeProgression.computeProgression(d);
88
		}
82
		Progression progression = new Progression(corpus);
83
		progression.setQueries(queries);
84
		
85
		TXMEditor.openEditor(progression, ProgressionEditor.class.getName());
89 86
		return null;
90 87
	}
91 88

  
......
109 106
		
110 107
		Corpus corpus = voceditor.getCorpus();
111 108

  
112
		Shell shell = voceditor.getSite().getShell();
113
		final ___ProgressionDialog d = new ___ProgressionDialog(shell, corpus, queries);
114
		int code = d.open();
115
		if (code == Window.OK) {
116
			ComputeProgression.computeProgression(d);
117
		}
109
		Progression progression = new Progression(corpus);
110
		progression.setQueries(queries);
111
		
112
		TXMEditor.openEditor(progression, ProgressionEditor.class.getName());
118 113
		return null;
119 114
	}
120 115

  
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/TextToConcordance.java (revision 671)
41 41
import org.txm.rcp.RCPMessages;
42 42
import org.txm.rcp.editors.IEditionEditor;
43 43
import org.txm.rcp.editors.TXMResultEditorInput;
44
import org.txm.searchengine.cqp.core.tests.Concordances;
45 44
import org.txm.searchengine.cqp.corpus.Corpus;
46 45
import org.txm.searchengine.cqp.corpus.query.Query;
47 46

  
tmp/org.txm.links.rcp/src/org/txm/rcp/commands/link/IndexToConcordance.java (revision 671)
119 119
//			String queryname = "Q"+Corpus.getNextQueryCounter();
120 120
//			String interQueryString = queryname+"=intersect "+indexResult.getQualifiedCqpId()+" "+indexOccResult.getQualifiedCqpId()+";"; 
121 121
//			System.out.println("Compute inter query: "+interQueryString);
122
//			((MemCqiClient)Toolbox.getCqiClient()).query(interQueryString);
122
//			((MemCqiClient)CQPEngine.getCqiClient()).query(interQueryString);
123 123
//			
124 124
//			QueryResult inter = new QueryResult(queryname, queryname, corpus, new Query(interQueryString));
125 125
//			System.out.println("indexResult size: "+indexResult.getNMatch());
......
131 131
//		} catch (Exception e) {
132 132
//			e.printStackTrace();
133 133
//			try {
134
//				System.out.println("CQP error: "+Toolbox.getCqiClient().getLastError());
134
//				System.out.println("CQP error: "+CQPEngine.getCqiClient().getLastError());
135 135
//			} catch (Exception e1) {
136 136
//				e1.printStackTrace();
137 137
//			}
tmp/org.txm.querycooccurrences.rcp/src/org/txm/links/coocmatrix/toCA.java (revision 671)
28 28
		LexicalTable table = coocs.toLexicalTable();
29 29
		
30 30
		CA ca = new CA(table);
31
		ca.setParameters(analysisProperty, null, null);
32 31
		
33 32
		return ca;
34 33
	}
tmp/org.txm.querycooccurrences.rcp/src/org/txm/functions/coocmatrix/QueryAutoCooccurrence.java (revision 671)
255 255
		int fmin = table.getFMin();
256 256

  
257 257
		CA ca = new CA(table);
258
		ca.setParameters(analysisProperty, null, null);
259 258

  
260 259
		return ca;
261 260
	}
tmp/org.txm.querycooccurrences.rcp/src/org/txm/functions/coocmatrix/QueryCooccurrence.java (revision 671)
187 187
		int fmin = table.getFMin();
188 188
		
189 189
		CA ca = new CA(table);
190
		ca.setParameters(analysisProperty, null, null);
191 190
		
192 191
		return ca;
193 192
	}
......
276 275
		return false;
277 276
	}
278 277

  
278
	@Override
279
	protected boolean _compute() throws Exception {
280
		// TODO Auto-generated method stub
281
		return false;
282
	}
283

  
279 284
}
tmp/org.txm.querycooccurrences.rcp/src/org/txm/rcpapplication/commands/function/ComputeQueryAutoCooccurrence.java (revision 671)
57 57
import org.txm.functions.queryindex.QueryIndex;
58 58
import org.txm.functions.queryindex.QueryIndexLine;
59 59
import org.txm.rcp.JobsTimer;
60
import org.txm.rcp.Messages;
60
import org.txm.rcp.RCPMessages;
61 61
import org.txm.rcp.utils.JobHandler;
62 62
import org.txm.rcp.views.QueriesView;
63 63
import org.txm.rcp.views.corpora.CorporaView;
......
98 98
					JobsTimer.start();
99 99

  
100 100
					if (!(element instanceof QueryIndex)) {
101
						System.out.println(Messages.ComputeCooccurrences_1+ element);
101
						System.out.println(RCPMessages.ComputeCooccurrences_1+ element);
102 102
						return Status.CANCEL_STATUS;
103 103
					}
104 104
					QueryIndex qi = ((QueryIndex)element);
......
120 120

  
121 121
					if (cooc == null) return null;
122 122
					
123
					corpus.addResult(cooc);
124
					System.out.println(Messages.ComputeCoocMatrix_0+cooc.getSymbol());
123
					System.out.println(RCPMessages.ComputeCoocMatrix_0+cooc.getSymbol());
125 124

  
126 125
					syncExec(new Runnable() {
127 126
						@Override
......
136 135
					return Status.CANCEL_STATUS;
137 136
				} catch (Exception e) {
138 137
					Log.printStackTrace(e);
139
					try { System.out.println(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
138
					try { System.out.println(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
140 139
					} catch (Exception e1) { e1.printStackTrace(); }
141 140
				} finally {
142 141
					monitor.done();
......
165 164
			names.add(line.getName());
166 165
		}
167 166

  
168
		System.out.println(Messages.ProgressionDialog_8+queries);
169
		System.out.println(Messages.MergeCols_5+names);
167
		System.out.println(RCPMessages.ProgressionDialog_8+queries);
168
		System.out.println(RCPMessages.MergeCols_5+names);
170 169

  
171 170
		QueryAutoCooccurrence cooc = null;
172 171
		try {
......
176 175
			System.out.println("Estimated time: "+(nqueries*reqtime/1000)+" secs");
177 176
			cooc = new QueryAutoCooccurrence(corpus);
178 177
			cooc.setParameters(queries, names, dist, min, struct, oriented, new ConsoleProgressBar(nqueries));
179
			System.out.println(Messages.ComputeCoocMatrix_1+cooc.getNNodes());
180
			System.out.println(Messages.ComputeCoocMatrix_2+cooc.getNEdges());
181
			System.out.println(Messages.ComputeCoocMatrix_3+dist);
178
			System.out.println(RCPMessages.ComputeCoocMatrix_1+cooc.getNNodes());
179
			System.out.println(RCPMessages.ComputeCoocMatrix_2+cooc.getNEdges());
180
			System.out.println(RCPMessages.ComputeCoocMatrix_3+dist);
182 181

  
183 182
			if (outfile != null) {
184 183
				cooc.toGraphml(outfile);
185
				System.out.println(Messages.ComputeCoocMatrix_4+outfile);
184
				System.out.println(RCPMessages.ComputeCoocMatrix_4+outfile);
186 185
			}
187 186

  
188 187
		} catch (Exception e) {
189 188
			Log.printStackTrace(e);
190
			try { System.out.println(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
189
			try { System.out.println(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
191 190
			} catch (Exception e1) { e1.printStackTrace(); }
192 191
		}
193 192
		return cooc;
......
227 226
		@Override
228 227
		protected void configureShell(Shell newShell) {
229 228
			super.configureShell(newShell);
230
			newShell.setText(Messages.ComputeCoocMatrix_7);
229
			newShell.setText(RCPMessages.ComputeCoocMatrix_7);
231 230
		}
232 231

  
233 232
		/* (non-Javadoc)
......
242 241
			composite.setLayout(layout);
243 242

  
244 243
			Label anaPropLabel = new Label(composite, SWT.NONE);
245
			anaPropLabel.setText(Messages.ParaBrowserEditor_5);
244
			anaPropLabel.setText(RCPMessages.ParaBrowserEditor_5);
246 245
			anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
247 246

  
248 247
			propsCombo = new org.eclipse.swt.widgets.List(composite, SWT.READ_ONLY);
......
265 264
			}
266 265

  
267 266
			Label distLabel = new Label(composite, SWT.NONE);
268
			distLabel.setText(Messages.ComputeCoocMatrix_10);
267
			distLabel.setText(RCPMessages.ComputeCoocMatrix_10);
269 268
			distLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
270 269
					false, false));
271 270
			distSpinner = new Spinner(composite, SWT.BORDER);
......
274 273
			distSpinner.setSelection(10);
275 274

  
276 275
			Label minLabel = new Label(composite, SWT.NONE);
277
			minLabel.setText(Messages.ComputeCoocMatrix_11);
276
			minLabel.setText(RCPMessages.ComputeCoocMatrix_11);
278 277
			minLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
279 278
					false, false));
280 279
			minSpinner = new Spinner(composite, SWT.BORDER);
......
290 289
			orientedButton.setSelection(false);
291 290

  
292 291
			outfileLabel = new Label(composite, SWT.NONE);
293
			outfileLabel.setText(Messages.ComputeCoocMatrix_12);
292
			outfileLabel.setText(RCPMessages.ComputeCoocMatrix_12);
294 293
			outfileLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
295 294
					false, false));
296 295

  
297 296
			Button outfileButton = new Button(composite, SWT.PUSH);
298
			outfileButton.setText(Messages.ComputeCoocMatrix_13);
297
			outfileButton.setText(RCPMessages.ComputeCoocMatrix_13);
299 298
			outfileButton.addSelectionListener(new SelectionListener() {
300 299
				@Override
301 300
				public void widgetSelected(SelectionEvent e) {
tmp/org.txm.querycooccurrences.rcp/src/org/txm/rcpapplication/commands/function/ComputeQueryCooccurrence.java (revision 671)
60 60
import org.txm.functions.coocmatrix.QueryCooccurrence;
61 61
//import org.txm.functions.queryindex.*;
62 62
import org.txm.rcp.JobsTimer;
63
import org.txm.rcp.Messages;
63
import org.txm.rcp.RCPMessages;
64 64
import org.txm.rcp.utils.JobHandler;
65 65
import org.txm.rcp.views.QueriesView;
66 66
import org.txm.rcp.views.corpora.CorporaView;
......
100 100
					JobsTimer.start();
101 101

  
102 102
					if (!(element instanceof Corpus)) {
103
						System.out.println(Messages.ComputeCooccurrences_1+ element);
103
						System.out.println(RCPMessages.ComputeCooccurrences_1+ element);
104 104
						return Status.CANCEL_STATUS;
105 105
					}
106 106
					Corpus corpus = ((Corpus)element);
......
121 121

  
122 122
					if (cooc == null) return null;
123 123

  
124
					corpus.addResult(cooc);
125
					System.out.println(Messages.ComputeCoocMatrix_0+cooc.getSymbol());
124
					System.out.println(RCPMessages.ComputeCoocMatrix_0+cooc.getSymbol());
126 125

  
127 126
					syncExec(new Runnable() {
128 127
						@Override
......
137 136
					return Status.CANCEL_STATUS;
138 137
				} catch (Exception e) {
139 138
					Log.printStackTrace(e);
140
					try { System.out.println(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
139
					try { System.out.println(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
141 140
					} catch (Exception e1) { e1.printStackTrace(); }
142 141
				} finally {
143 142
					monitor.done();
......
163 162
		getQueriesAndNames(dialog.getQueryFile1(), queries1, names1);
164 163
		getQueriesAndNames(dialog.getQueryFile2(), queries2, names2);
165 164

  
166
		System.out.println(Messages.ProgressionDialog_8+queries1);
167
		System.out.println(Messages.MergeCols_5+names1);
165
		System.out.println(RCPMessages.ProgressionDialog_8+queries1);
166
		System.out.println(RCPMessages.MergeCols_5+names1);
168 167

  
169 168
		QueryCooccurrence cooc = null;
170 169
		try {
......
172 171
			System.out.println("Number of queries: "+nqueries);
173 172
			System.out.println("Estimated time: "+(nqueries*reqtime/1000)+" secs");
174 173
			cooc = new QueryCooccurrence(corpus, queries1, names1, queries2, names2, dist, min, struct);
175
			System.out.println(Messages.ComputeCoocMatrix_1+cooc.getNNodes());
176
			System.out.println(Messages.ComputeCoocMatrix_2+cooc.getNEdges());
177
			System.out.println(Messages.ComputeCoocMatrix_3+dist);
174
			System.out.println(RCPMessages.ComputeCoocMatrix_1+cooc.getNNodes());
175
			System.out.println(RCPMessages.ComputeCoocMatrix_2+cooc.getNEdges());
176
			System.out.println(RCPMessages.ComputeCoocMatrix_3+dist);
178 177
		} catch (Exception e) {
179 178
			// TODO Auto-generated catch block
180 179
			Log.printStackTrace(e);
181
			try { System.out.println(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
180
			try { System.out.println(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
182 181
			} catch (Exception e1) { e1.printStackTrace(); }
183 182
		}
184 183
		return cooc;
......
240 239
		@Override
241 240
		protected void configureShell(Shell newShell) {
242 241
			super.configureShell(newShell);
243
			newShell.setText(Messages.ComputeCoocMatrix_7);
242
			newShell.setText(RCPMessages.ComputeCoocMatrix_7);
244 243
		}
245 244

  
246 245
		/* (non-Javadoc)
......
255 254
			composite.setLayout(layout);
256 255

  
257 256
			Label anaPropLabel = new Label(composite, SWT.NONE);
258
			anaPropLabel.setText(Messages.ParaBrowserEditor_5);
257
			anaPropLabel.setText(RCPMessages.ParaBrowserEditor_5);
259 258
			anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
260 259

  
261 260
			propsCombo = new org.eclipse.swt.widgets.List(composite, SWT.READ_ONLY);
......
278 277
			}
279 278

  
280 279
			Label distLabel = new Label(composite, SWT.NONE);
281
			distLabel.setText(Messages.ComputeCoocMatrix_10);
280
			distLabel.setText(RCPMessages.ComputeCoocMatrix_10);
282 281
			distLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
283 282
					false, false));
284 283
			distSpinner = new Spinner(composite, SWT.BORDER);
......
287 286
			distSpinner.setSelection(10);
288 287

  
289 288
			Label minLabel = new Label(composite, SWT.NONE);
290
			minLabel.setText(Messages.ComputeCoocMatrix_11);
289
			minLabel.setText(RCPMessages.ComputeCoocMatrix_11);
291 290
			minLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
292 291
					false, false));
293 292
			minSpinner = new Spinner(composite, SWT.BORDER);
tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/commands/LemmaProjection.java (revision 671)
254 254

  
255 255
					// update corpus
256 256
					// update corpus indexes and edition
257
					//					String txmhome = Toolbox.getParam(Toolbox.USER_TXM_HOME);
257
					//					String txmhome = Toolbox.getTXMHOMEPATH();
258 258
					//
259 259
					//					BaseParameters params = corpus.getBase().getBaseParameters();
260 260
					//					params.getKeyValueParameters().put(ImportKeys.MULTITHREAD, "false"); //too soon
tmp/org.txm.queryindex.rcp/src/org/txm/functions/queryindex/QueryIndex.java (revision 671)
442 442
		return false;
443 443
	}
444 444

  
445
	@Override
446
	public boolean saveParameters() throws Exception {
447
		// TODO Auto-generated method stub
448
		return false;
449
	}
450

  
451
	@Override
452
	public boolean loadParameters() throws Exception {
453
		// TODO Auto-generated method stub
454
		return false;
455
	}
456

  
457
	@Override
458
	public boolean setParameters(TXMParameters parameters) throws Exception {
459
		// TODO Auto-generated method stub
460
		return false;
461
	}
462

  
445 463
}
tmp/org.txm.queryindex.rcp/src/org/txm/functions/queryindex/messages.properties (revision 671)
1
QueryIndexEditor_0=Query Index of
2
QueryIndexEditor_1=replacing line\:
3
QueryIndexEditor_10=queries
4
QueryIndexEditor_11=
5
QueryIndexEditor_2=Failed to add line with query\:
6
QueryIndexEditor_3=Line added.
7
QueryIndexEditor_4=Load from a file
8
QueryIndexEditor_5=*.properties
9
QueryIndexEditor_6=Cannot read from file\:
10
QueryIndexEditor_7=Link to concordance
11
QueryIndexEditor_8=Link to progression
12
QueryIndexEditor_9=delete lines
0 13

  
tmp/org.txm.queryindex.rcp/src/org/txm/functions/queryindex/Messages.java (revision 671)
1
package org.txm.functions.queryindex;
2

  
3
import org.eclipse.osgi.util.NLS;
4
import org.txm.utils.messages.Utf8NLS;
5

  
6

  
7
/**
8
 * QueryIndex messages.
9
 * 
10
 * @author mdecorde
11
 * @author sjacquot
12
 *
13
 */
14
public class Messages extends NLS {
15

  
16
	private static final String BUNDLE_NAME = "org.txm.partition.core.messages.messages"; //$NON-NLS-1$
17

  
18
	public static String QueryIndexEditor_0;
19
	public static String QueryIndexEditor_1;
20
	public static String QueryIndexEditor_10;
21
	public static String QueryIndexEditor_11;
22
	public static String QueryIndexEditor_2;
23
	public static String QueryIndexEditor_3;
24
	public static String QueryIndexEditor_4;
25
	public static String QueryIndexEditor_5;
26
	public static String QueryIndexEditor_6;
27
	public static String QueryIndexEditor_7;
28
	public static String QueryIndexEditor_8;
29
	public static String QueryIndexEditor_9;
30
	
31
	static {
32
		// initialize resource bundle
33
		Utf8NLS.initializeMessages(BUNDLE_NAME, Messages.class);
34
	}
35

  
36
	private Messages() {
37
	}
38
}
0 39

  
tmp/org.txm.queryindex.rcp/src/org/txm/functions/queryindex/messages_fr.properties (revision 671)
1
QueryIndexEditor_0=Index de requ\u00EAte de \: 
2
QueryIndexEditor_1=remplacement des lignes \: 
3
QueryIndexEditor_10=requ\u00EAtes
4
QueryIndexEditor_11=
5
QueryIndexEditor_2=Erreur lors de l'ajout de la requ\u00EAte \: 
6
QueryIndexEditor_3=Requ\u00EAte ajoutée
7
QueryIndexEditor_4=Chargement depuis un fichier
8
QueryIndexEditor_5=*.properties
9
QueryIndexEditor_6=Le fichier suivant ne peut \u00EAtre lu \: 
10
QueryIndexEditor_7=Vers les concordances
11
QueryIndexEditor_8=Vers la progression
12
QueryIndexEditor_9=Supprimer les lignes
0 13

  
tmp/org.txm.queryindex.rcp/src/org/txm/rcpapplication/editors/queryindex/QueryIndexEditor.java (revision 671)
77 77
import org.txm.index.core.functions.LineComparator.SortMode;
78 78
import org.txm.index.rcp.messages.IndexUIMessages;
79 79
import org.txm.rcp.JobsTimer;
80
import org.txm.rcp.Messages;
80
import org.txm.rcp.RCPMessages;
81 81
import org.txm.rcp.StatusLine;
82
import org.txm.rcp.editors.TXMEditorPart;
82
import org.txm.rcp.editors.TXMEditor;
83 83
import org.txm.rcp.editors.TableKeyListener;
84 84
import org.txm.rcp.swt.dialog.LastOpened;
85 85
import org.txm.rcp.swt.widget.NamedAssistedQueryWidget;
......
96 96
import org.txm.searchengine.cqp.corpus.query.Query;
97 97
import org.txm.statsengine.r.rcp.views.RVariablesView;
98 98
import org.txm.utils.logger.Log;
99
import org.txm.functions.queryindex.*;
99 100

  
100 101
/**
101 102
 * display the query index parameters and result.
102 103
 * 
103 104
 * @author mdecorde
104 105
 */
105
public class QueryIndexEditor extends TXMEditorPart {
106
public class QueryIndexEditor extends TXMEditor<QueryIndex> {
106 107

  
107 108
	/** The Constant ID. */
108 109
	public static final String ID = "org.txm.rcpapplication.editors.queryindex.QueryIndexEditor"; //$NON-NLS-1$
......
326 327
							return Status.CANCEL_STATUS;
327 328

  
328 329
						this.acquireSemaphore();
329
						if (!stored) {
330
							if (partition != null)
331
								partition.addResult(queryindex);
332
							else
333
								corpus.addResult(queryindex);
334
							stored = true;
335
						}
336 330
						this.releaseSemaphore();
337 331

  
338 332
						final String message = Messages.QueryIndexEditor_3;
......
373 367
					} catch (Exception e) {
374 368
						System.out.println(e.getLocalizedMessage());
375 369
						try {
376
							System.out.println(Messages.LastCQPError
370
							System.out.println(RCPMessages.LastCQPError
377 371
									+ CQPEngine.getCqiClient().getLastCQPError());
378 372
						} catch (Exception e1) {
379 373
							System.out.println(IndexUIMessages.IndexEditor_10
......
405 399
	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
406 400
	 */
407 401
	@Override
408
	public void createPartControl(final Composite parent) {
402
	public void _createPartControl(final Composite parent) {
409 403
		FormLayout parentLayout = new FormLayout();
410 404
		parent.setLayout(parentLayout);
411 405

  
......
481 475
		// | Query: [ (v)] [Search] |
482 476
		// Query:
483 477
		// queryLabel = new Label(queryArea, SWT.NONE);
484
		// queryLabel.setText(Messages.IndexEditor_3);
478
		// queryLabel.setText(RCPMessages.IndexEditor_3);
485 479
		// queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false,
486 480
		// true));
487 481

  
......
535 529
						queryindex.addLinesFromFile(propFile);
536 530
						queryindex.sortLines(SortMode.FREQUNIT, true);
537 531

  
538
						if (!stored)
539
							if (partition != null)
540
								partition.addResult(queryindex);
541
							else
542
								corpus.addResult(queryindex);
543 532
						stored = true;
544 533

  
545 534
						fillDisplayArea(0, NLignePPageSpinner.getSelection());
......
795 784
		nColumn.pack();
796 785

  
797 786
		unitColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
798
		unitColumn.setText(Messages.ReferencerEditor_9);
799
		unitColumn.setToolTipText(Messages.ReferencerEditor_9);
787
		unitColumn.setText(RCPMessages.ReferencerEditor_9);
788
		unitColumn.setToolTipText(RCPMessages.ReferencerEditor_9);
800 789
		unitColumn.setWidth(200);
801 790
		unitColumn.addSelectionListener(new SelectionListener() {
802 791
			@Override
......
828 817
		freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
829 818
		try {
830 819
			if (partition != null)
831
				freqColumn.setText(Messages.FrequencyListEditorInput_4
820
				freqColumn.setText(RCPMessages.FrequencyListEditorInput_4
832 821
						+ " T=" + partition.getTotalSize()); //$NON-NLS-1$
833 822
			else
834
				freqColumn.setText(Messages.FrequencyListEditorInput_4
823
				freqColumn.setText(RCPMessages.FrequencyListEditorInput_4
835 824
						+ " T=" + corpus.getSize()); //$NON-NLS-1$
836 825
		} catch (CqiClientException e2) {
837 826
			Log.printStackTrace(e2);
838 827
			return;
839 828
		}
840
		freqColumn.setToolTipText(Messages.FrequencyListEditorInput_4);
829
		freqColumn.setToolTipText(RCPMessages.FrequencyListEditorInput_4);
841 830
		freqColumn.setWidth(100);
842 831
		freqColumn.addSelectionListener(new SelectionListener() {
843 832
			@Override
......
995 984
			queryWidget.setText(""); //$NON-NLS-1$
996 985

  
997 986
			if (partition != null) {
998
				setPartName(Messages.ObjectExplorer_9 + partition.getName());
987
				setPartName(partition.getName());
999 988
			} else {
1000
				setPartName(Messages.ObjectExplorer_9 + corpus.getName());
989
				setPartName(corpus.getName());
1001 990
			}
1002 991
			queryWidget.setFocus();
1003 992
		} else {
......
1113 1102
	}
1114 1103

  
1115 1104
	@Override
1116
	public boolean isResultUsingParent(TXMResult parent) {
1117
		return queryindex.getParent().equals(parent);
1105
	public void updateResultFromEditor() {
1106
		// TODO Auto-generated method stub
1107
		
1118 1108
	}
1119 1109

  
1120 1110
	@Override
1121
	public void computeResult() {
1122
		System.out.println("Not implemented.");
1111
	public void updateEditorFromResult(boolean update) {
1112
		// TODO Auto-generated method stub
1113
		
1123 1114
	}
1124 1115
}
tmp/org.txm.queryindex.rcp/src/org/txm/rcpapplication/commands/link/QueryIndexToLexicalTable.java (revision 671)
42 42
import org.eclipse.ui.handlers.HandlerUtil;
43 43
import org.txm.functions.queryindex.QueryIndex;
44 44
import org.txm.lexicaltable.core.functions.LexicalTable;
45
import org.txm.rcp.Messages;
45
import org.txm.rcp.RCPMessages;
46 46
import org.txm.rcp.StatusLine;
47 47
import org.txm.searchengine.cqp.corpus.Partition;
48 48
import org.txm.searchengine.cqp.corpus.Property;
......
86 86

  
87 87
		if (!qindex.isComputedWithPartition()) {
88 88
			
89
			System.out.println(Messages.IndexToLexicalTable_0);
90
			StatusLine.setMessage(Messages.IndexToLexicalTable_0);
89
			System.out.println(RCPMessages.IndexToLexicalTable_0);
90
			StatusLine.setMessage(RCPMessages.IndexToLexicalTable_0);
91 91
			return false;
92 92
		}
93 93

  
94
		System.out.println(Messages.ComputeLexicalTable_3);
94
		System.out.println(RCPMessages.ComputeLexicalTable_3);
95 95
		ArrayList<String> choices = new ArrayList<String>();
96
		choices.add(Messages.ComputeLexicalTable_16);
97
		choices.add(Messages.ComputeLexicalTable_12);
96
		choices.add(RCPMessages.ComputeLexicalTable_16);
97
		choices.add(RCPMessages.ComputeLexicalTable_12);
98 98
		ListSelectionDialog dialog = new ListSelectionDialog(shell, 
99 99
				choices, new ArrayContentProvider(), new LabelProvider(), 
100
				Messages.ComputeLexicalTable_13);
100
				RCPMessages.ComputeLexicalTable_13);
101 101
		
102 102
		int ret = dialog.open();
103 103
		//System.out.println("ret= "+ret);
......
124 124
//			IWorkbenchPage page = window.getActivePage();
125 125
//			LexicalTableEditorInput editorInput = new LexicalTableEditorInput(
126 126
//					table, partition, property);
127
//			StatusLine.setMessage(Messages.ComputeLexicalTable_10);
127
//			StatusLine.setMessage(RCPMessages.ComputeLexicalTable_10);
128 128
//			page
129 129
//					.openEditor(editorInput,
130 130
//							"org.txm.rcpapplication.editors.lexicaltable.LexicalTableEditor"); //$NON-NLS-1$
tmp/org.txm.queryindex.rcp/.settings/org.eclipse.core.resources.prefs (revision 671)
1
eclipse.preferences.version=1
2
encoding//src/org/txm/functions/queryindex/messages_fr.properties=UTF-8
0 3

  
tmp/org.txm.tigersearch.rcp/src/org/txm/function/tigersearch/TSIndex.java (revision 671)
104 104
		// get the cqp result of the query
105 105
		//	long time = System.currentTimeMillis();
106 106
		//		QueryResult result = corp.query(getQuery(), "index", true); //$NON-NLS-1$
107
		boolean isTargetUsed = false;//Toolbox.getCqiClient().subCorpusHasField(result.getQualifiedCqpId(), ICqiClient.CQI_CONST_FIELD_TARGET);
107
		boolean isTargetUsed = false;//CQPEngine.getCqiClient().subCorpusHasField(result.getQualifiedCqpId(), ICqiClient.CQI_CONST_FIELD_TARGET);
108 108

  
109 109
		// System.out.println("nLines : "+nLines);
110 110
		List<Match> matches;
......
119 119
		if (nbresults == 0) {
120 120
			return false;
121 121
		}
122
		this.nLines += nbresults; // get number of tokens
122
		this.nTotalTokens += nbresults; // get number of tokens
123 123

  
124 124
		// count matches
125 125
		// time = System.currentTimeMillis();
tmp/org.txm.tigersearch.rcp/src/org/txm/function/tigersearch/TIGERSearch.java (revision 671)
10 10
import org.eclipse.ui.plugin.AbstractUIPlugin;
11 11
import org.eclipse.core.runtime.IProgressMonitor;
12 12
import org.txm.core.results.TXMParameters;
13
import org.txm.functions.TXMCommand;
13
import org.txm.core.results.TXMResult;
14 14
import org.txm.searchengine.cqp.corpus.Corpus;
15 15
import org.txm.searchengine.cqp.corpus.MainCorpus;
16 16
import org.txm.searchengine.ts.TSCorpus;
......
20 20
import org.txm.tigersearch.commands.ComputeTIGERSearch;
21 21
import org.txm.utils.logger.Log;
22 22

  
23
public class TIGERSearch extends TXMCommand implements IAdaptable {
23
public class TIGERSearch extends TXMResult implements IAdaptable {
24 24

  
25 25
	TSCorpusManager manager;
26 26
	TSCorpus tscorpus;
......
31 31
	private String query;
32 32

  
33 33
	public TIGERSearch(Corpus corpus) {
34
		super(corpus);
34 35
		this.corpus = corpus.getMainCorpus();
35 36

  
36 37
		String id = corpus.getName();
......
205 206
	public void clean() {
206 207
		
207 208
	}
208

  
209
	@Override
210
	public boolean delete() {
211
		return corpus.removeChild(this);
212
	}
213 209
	
214 210
	/**
215 211
	 * 
......
241 237
	}
242 238

  
243 239
	@Override
244
	public boolean validateParameters() {
240
	public boolean canCompute() {
245 241
		return corpus != null && query.length() > 0;
246 242
	}
247 243

  
......
249 245
	public boolean setParameters(TXMParameters parameters) {
250 246
		return false;
251 247
	}
248

  
249
	@Override
250
	public boolean saveParameters() throws Exception {
251
		// TODO Auto-generated method stub
252
		return false;
253
	}
254

  
255
	@Override
256
	public boolean loadParameters() throws Exception {
257
		// TODO Auto-generated method stub
258
		return false;
259
	}
260

  
261
	@Override
262
	protected boolean _compute() throws Exception {
263
		// TODO Auto-generated method stub
264
		return false;
265
	}
252 266
}
tmp/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java (revision 671)
79 79
import org.txm.index.rcp.editors.LineLabelProvider;
80 80
import org.txm.index.rcp.messages.IndexUIMessages;
81 81
import org.txm.rcp.JobsTimer;
82
import org.txm.rcp.Messages;
82
import org.txm.rcp.RCPMessages;
83 83
import org.txm.rcp.StatusLine;
84
import org.txm.rcp.editors.TXMEditorPart;
84
import org.txm.rcp.editors.TXMEditor;
85 85
import org.txm.rcp.editors.TXMResultEditorInput;
86 86
import org.txm.rcp.editors.TableKeyListener;
87 87
import org.txm.rcp.preferences.RCPPreferences;
......
105 105
 *
106 106
 * @author mdecorde
107 107
 */
108
public class TSIndexEditor extends TXMEditorPart {
108
public class TSIndexEditor extends TXMEditor<TSIndex> {
109 109

  
110 110
	/** The Constant ID. */
111 111
	public static final String ID = "org.txm.tigersearch.editors.TSIndexEditor"; //$NON-NLS-1$
......
133 133
	protected Button go;
134 134

  
135 135
	/** The props area. */
136
	protected PropertiesSelector propsArea;
136
	protected PropertiesSelector<Property> propsArea;
137 137
	// seuils
138 138
	/** The Fmin spinner. */
139 139
	protected Spinner FminSpinner;
......
300 300
		final int Fmin = Integer.parseInt(FminSpinner.getText());
301 301
		final int Fmax = Integer.parseInt(FmaxSpinner.getText());
302 302
		final int Tmax = Integer.parseInt(this.TmaxSpinner.getText());
303
		final List<Property> properties = propsArea.getProperties();
303
		final List<Property> properties = propsArea.getSelectedProperties();
304 304
		try {
305 305
			title = NLS.bind(IndexUIMessages.IndexEditor_2, new Object[]{
306 306
					query.getQueryString(), properties, corpus.getName()});
......
360 360

  
361 361
						final String message;
362 362
						if (index.getV() == 1)
363
							message= (Messages.ConcordancesEditor_52);
363
							message= ("one result");
364 364
						else if (index.getV() > 0)
365
							message= (IndexUIMessages.bind(Messages.CreatePartition_55, index.getV(), index.getT()));
365
							message= (IndexUIMessages.bind(RCPMessages.CreatePartition_55, index.getV(), index.getT()));
366 366
						else
367 367
							message= (IndexUIMessages.IndexEditor_31);
368 368

  
......
401 401
					} catch (Exception e) {
402 402
						System.out.println(e.getLocalizedMessage());
403 403
						try {
404
							System.out.println(Messages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
404
							System.out.println(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
405 405
						} catch (Exception e1) {
406 406
							System.out.println(IndexUIMessages.IndexEditor_10+e1);
407 407
						}
......
453 453
	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
454 454
	 */
455 455
	@Override
456
	public void createPartControl(final Composite parent) {
456
	public void _createPartControl(final Composite parent) {
457

  
457 458
		FormLayout parentLayout = new FormLayout();
458 459
		parent.setLayout(parentLayout);
459 460

  
......
861 862
		nColumn.pack();
862 863

  
863 864
		unitColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
864
		unitColumn.setText(Messages.ReferencerEditor_9);
865
		unitColumn.setToolTipText(Messages.ReferencerEditor_9);
865
		unitColumn.setText(RCPMessages.ReferencerEditor_9);
866
		unitColumn.setToolTipText(RCPMessages.ReferencerEditor_9);
866 867
		unitColumn.setWidth(200);
867 868
		unitColumn.addSelectionListener(new SelectionListener() {
868 869
			@Override
......
894 895
		freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
895 896
		try {
896 897
			if(partition != null)
897
				freqColumn.setText(Messages.FrequencyListEditorInput_4+" T="+partition.getTotalSize()); //$NON-NLS-1$
898
				freqColumn.setText(RCPMessages.FrequencyListEditorInput_4+" T="+partition.getTotalSize()); //$NON-NLS-1$
898 899
			else
899
				freqColumn.setText(Messages.FrequencyListEditorInput_4+" T="+corpus.getSize()); //$NON-NLS-1$
900
				freqColumn.setText(RCPMessages.FrequencyListEditorInput_4+" T="+corpus.getSize()); //$NON-NLS-1$
900 901
		} catch (CqiClientException e2) {
901 902
			Log.printStackTrace(e2);
902 903
			return;
903 904
		}
904
		freqColumn.setToolTipText(Messages.FrequencyListEditorInput_4);
905
		freqColumn.setToolTipText(RCPMessages.FrequencyListEditorInput_4);
905 906
		freqColumn.setWidth(100);
906 907
		freqColumn.addSelectionListener(new SelectionListener() {
907 908
			@Override
......
1083 1084
			this.FmaxSpinner.setSelection(9999999);
1084 1085

  
1085 1086
			if (partition != null)
1086
				setPartName(Messages.ObjectExplorer_9 + partition.getName());
1087
				setPartName(partition.getName());
1087 1088
			else
1088
				setPartName(Messages.ObjectExplorer_9 + corpus.getName());
1089
				setPartName(corpus.getName());
1089 1090
			queryWidget.setFocus();
1090 1091
		} else {
1091 1092
			System.err.println(IndexUIMessages.IndexEditor_22);
......
1210 1211
		return this.index;
1211 1212
	}
1212 1213

  
1213

  
1214 1214
	public Query getQuery() {
1215 1215
		return new Query(queryWidget.getText());
1216 1216
	}
1217 1217

  
1218 1218
	@Override
1219
	public boolean isResultUsingParent(TXMResult parent) {
1220
		return this.corpus.getName().equals(parent.getName());
1219
	public void updateResultFromEditor() {
1220
		// TODO Auto-generated method stub
1221
		
1221 1222
	}
1222 1223

  
1223 1224
	@Override
1224
	public void computeResult() {
1225
		System.out.println("not implemented.");
1225
	public void updateEditorFromResult(boolean update) {
1226
		// TODO Auto-generated method stub
1227
		
1226 1228
	}
1227 1229
}
tmp/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TIGERSearchEditor.java (revision 671)
34 34
import org.txm.function.tigersearch.TIGERSearch;
35 35
import org.txm.rcp.IImageKeys;
36 36
import org.txm.rcp.JobsTimer;
37
import org.txm.rcp.editors.TXMEditorPart;
37
import org.txm.rcp.editors.TXMEditor;
38 38
import org.txm.rcp.svg.SVGComposite;
39 39
import org.txm.rcp.utils.JobHandler;
40 40
import org.txm.rcp.views.QueriesView;
......
46 46
//import org.txm.functions.queryindex.QueryIndex;
47 47

  
48 48

  
49
public class TIGERSearchEditor extends TXMEditorPart {
49
public class TIGERSearchEditor extends TXMEditor<TIGERSearch> {
50 50
	
51 51
	/** The Constant ID. */
52 52
	public static final String ID = "org.txm.tigersearch.editors.TIGERSearchEditor"; //$NON-NLS-1$
......
72 72
	private boolean isStored = false;
73 73

  
74 74
	@Override
75
	public void createPartControl(Composite parent) {
75
	public void _createPartControl(Composite parent) {
76 76
		
77 77
		Composite mainPanel = new Composite(parent, SWT.NONE);
78 78
		mainPanel.setLayout(new FormLayout());
......
299 299
					try {
300 300
						ts.compute(query);
301 301
						if (ts.isComputed() && !isStored) {
302
							corpus.addChild(ts);
303 302
							isStored = true;
304 303
						}
305 304
					} catch(Exception e) {
......
430 429
	}
431 430

  
432 431
	@Override
433
	public boolean isResultUsingParent(TXMResult parent) {
434
		if (parent instanceof Corpus) {
435
			Corpus c = (Corpus) parent;
436
			return this.corpus.getQualifiedCqpId().equals(c.getQualifiedCqpId());
437
		}
438
		return false;
432
	public void updateResultFromEditor() {
433
		// TODO Auto-generated method stub
434
		
439 435
	}
440 436

  
441 437
	@Override
442
	public void computeResult() {
443
		System.out.println("not implemented.");
438
	public void updateEditorFromResult(boolean update) {
439
		// TODO Auto-generated method stub
440
		
444 441
	}
445 442
}
tmp/org.txm.tigersearch.rcp/src/org/txm/importer/srcmf/tigersearchLoader.groovy (revision 671)
80 80
File tigerSrcDir = new File(rootDir, "tiger-xml");
81 81
File headerFile = new File(rootDir, "tiger-xml/header.xml");
82 82

  
83
File binDir = new File(Toolbox.getParam(Toolbox.USER_TXM_HOME),"corpora/"+basename);
83
File binDir = new File(Toolbox.getTXMHOMEPATH(),"corpora/"+basename);
84 84

  
85 85
binDir.deleteDir();
86 86
binDir.mkdirs();
tmp/org.txm.tigersearch.rcp/src/org/txm/importer/srcmf2/tigersearchLoader_old.groovy (revision 671)
81 81
File tigerSrcDir = new File(rootDir, "xml-ts");
82 82
File headerFile = new File(rootDir, "xml-ts/master.xml");
83 83

  
84
File binDir = new File(Toolbox.getParam(Toolbox.USER_TXM_HOME),"corpora/"+basename);
84
File binDir = new File(Toolbox.getTXMHOMEPATH(),"corpora/"+basename);
85 85

  
86 86
binDir.deleteDir();
87 87
binDir.mkdirs();
tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java (revision 671)
20 20
import org.eclipse.ui.model.IWorkbenchAdapter;
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff