Révision 1005
tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/adapters/InternalViewAdapterFactory.java (revision 1005) | ||
---|---|---|
23 | 23 |
|
24 | 24 |
@Override |
25 | 25 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
26 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof InternalView) {
|
|
26 |
if(this.canAdapt(adapterType) && adaptableObject instanceof InternalView) {
|
|
27 | 27 |
return new TXMResultAdapter() { |
28 | 28 |
@Override |
29 | 29 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.internalview.rcp/plugin.xml (revision 1005) | ||
---|---|---|
74 | 74 |
<adapter |
75 | 75 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
76 | 76 |
</adapter> |
77 |
<adapter |
|
78 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
79 |
</adapter> |
|
77 | 80 |
</factory> |
78 | 81 |
</extension> <extension |
79 | 82 |
point="org.eclipse.core.expressions.definitions"> |
tmp/org.txm.specificities.rcp/plugin.xml (revision 1005) | ||
---|---|---|
137 | 137 |
<adapter |
138 | 138 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
139 | 139 |
</adapter> |
140 |
<adapter |
|
141 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
142 |
</adapter> |
|
140 | 143 |
</factory> |
141 | 144 |
<factory |
142 | 145 |
adaptableType="org.txm.specificities.core.functions.SpecificitiesSelection" |
... | ... | |
144 | 147 |
<adapter |
145 | 148 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
146 | 149 |
</adapter> |
150 |
<adapter |
|
151 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
152 |
</adapter> |
|
147 | 153 |
</factory> |
148 | 154 |
</extension> |
149 | 155 |
<extension |
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/handlers/ComputeSpecifities.java (revision 1005) | ||
---|---|---|
89 | 89 |
} |
90 | 90 |
|
91 | 91 |
if (lexicalTable == null) { |
92 |
return super.logCanNotCompute(selection);
|
|
92 |
return super.logCanNotExecuteCommand(selection);
|
|
93 | 93 |
} |
94 | 94 |
specificities = new Specificities(lexicalTable); |
95 | 95 |
} |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/LoadVue.java (revision 1005) | ||
---|---|---|
30 | 30 |
@Override |
31 | 31 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
32 | 32 |
|
33 |
Object first = CorporaView.getSelection();
|
|
33 |
Object first = CorporaView.getFirstSelectedObject();
|
|
34 | 34 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
35 | 35 |
System.out.println(Messages.LoadVue_0+first); |
36 | 36 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/LoadStructure.java (revision 1005) | ||
---|---|---|
27 | 27 |
@Override |
28 | 28 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
29 | 29 |
|
30 |
Object first = CorporaView.getSelection();
|
|
30 |
Object first = CorporaView.getFirstSelectedObject();
|
|
31 | 31 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
32 | 32 |
System.out.println(Messages.LoadStructure_0+first); |
33 | 33 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/ExportGlozzCorpus.java (revision 1005) | ||
---|---|---|
36 | 36 |
// Open the parameters input dialog box |
37 | 37 |
if (!ParametersDialog.open(this)) return null; |
38 | 38 |
|
39 |
Object first = CorporaView.getSelection();
|
|
39 |
Object first = CorporaView.getFirstSelectedObject();
|
|
40 | 40 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
41 | 41 |
System.out.println(Messages.ExportGlozzCorpus_0+first); |
42 | 42 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/EditVue.java (revision 1005) | ||
---|---|---|
29 | 29 |
@Override |
30 | 30 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
31 | 31 |
|
32 |
Object first = CorporaView.getSelection();
|
|
32 |
Object first = CorporaView.getFirstSelectedObject();
|
|
33 | 33 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
34 | 34 |
System.out.println("Selection is not a corpus: "+first); |
35 | 35 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/EditStructure.java (revision 1005) | ||
---|---|---|
28 | 28 |
@Override |
29 | 29 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
30 | 30 |
|
31 |
Object first = CorporaView.getSelection();
|
|
31 |
Object first = CorporaView.getFirstSelectedObject();
|
|
32 | 32 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
33 | 33 |
System.out.println(Messages.EditStructure_0+first); |
34 | 34 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/SaveStructureAsGlozzModel.java (revision 1005) | ||
---|---|---|
18 | 18 |
@Override |
19 | 19 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
20 | 20 |
|
21 |
Object first = CorporaView.getSelection();
|
|
21 |
Object first = CorporaView.getFirstSelectedObject();
|
|
22 | 22 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
23 | 23 |
System.out.println(Messages.SaveStructureAsGlozzModel_0+first); |
24 | 24 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/LoadStructureFromGlozz.java (revision 1005) | ||
---|---|---|
25 | 25 |
@Override |
26 | 26 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
27 | 27 |
|
28 |
Object first = CorporaView.getSelection();
|
|
28 |
Object first = CorporaView.getFirstSelectedObject();
|
|
29 | 29 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
30 | 30 |
System.out.println(Messages.LoadStructureFromGlozz_0+first); |
31 | 31 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/LoadCorpus.java (revision 1005) | ||
---|---|---|
35 | 35 |
@Override |
36 | 36 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
37 | 37 |
|
38 |
Object first = CorporaView.getSelection();
|
|
38 |
Object first = CorporaView.getFirstSelectedObject();
|
|
39 | 39 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
40 | 40 |
System.out.println(Messages.LoadCorpus_0+first); |
41 | 41 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/ImportGlozzAnnotations.java (revision 1005) | ||
---|---|---|
60 | 60 |
return false; |
61 | 61 |
} |
62 | 62 |
|
63 |
Object first = CorporaView.getSelection();
|
|
63 |
Object first = CorporaView.getFirstSelectedObject();
|
|
64 | 64 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
65 | 65 |
System.out.println(Messages.ImportGlozzAnnotations_1+first); |
66 | 66 |
return false; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/SaveVue.java (revision 1005) | ||
---|---|---|
25 | 25 |
@Override |
26 | 26 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
27 | 27 |
|
28 |
Object first = CorporaView.getSelection();
|
|
28 |
Object first = CorporaView.getFirstSelectedObject();
|
|
29 | 29 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
30 | 30 |
System.out.println(Messages.SaveVue_0+first); |
31 | 31 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/SaveStructure.java (revision 1005) | ||
---|---|---|
24 | 24 |
@Override |
25 | 25 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
26 | 26 |
|
27 |
Object first = CorporaView.getSelection();
|
|
27 |
Object first = CorporaView.getFirstSelectedObject();
|
|
28 | 28 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
29 | 29 |
System.out.println(Messages.SaveStructure_0+first); |
30 | 30 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/ExportTEICorpus.java (revision 1005) | ||
---|---|---|
41 | 41 |
// Open the parameters input dialog box |
42 | 42 |
if (!ParametersDialog.open(this)) return null; |
43 | 43 |
|
44 |
Object first = CorporaView.getSelection();
|
|
44 |
Object first = CorporaView.getFirstSelectedObject();
|
|
45 | 45 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
46 | 46 |
System.out.println(Messages.ExportTEICorpus_0+first); |
47 | 47 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/ImportTEIAnnotations.java (revision 1005) | ||
---|---|---|
44 | 44 |
// Open the parameters input dialog box |
45 | 45 |
if (!ParametersDialog.open(this)) return null; |
46 | 46 |
|
47 |
Object first = CorporaView.getSelection();
|
|
47 |
Object first = CorporaView.getFirstSelectedObject();
|
|
48 | 48 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
49 | 49 |
System.out.println(Messages.ImportTEIAnnotations_0+first); |
50 | 50 |
return null; |
tmp/org.txm.analec.rcp/src/org/txm/analec/commands/SaveCorpus.java (revision 1005) | ||
---|---|---|
31 | 31 |
@Override |
32 | 32 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
33 | 33 |
|
34 |
Object first = CorporaView.getSelection();
|
|
34 |
Object first = CorporaView.getFirstSelectedObject();
|
|
35 | 35 |
if (!(first instanceof org.txm.searchengine.cqp.corpus.Corpus)) { |
36 | 36 |
System.out.println(Messages.SaveCorpus_0+first); |
37 | 37 |
return null; |
tmp/org.txm.cooccurrence.chartsengine/src/org/txm/cooccurrence/handlers/ComputeCooccurrenceGraph.java (revision 1005) | ||
---|---|---|
75 | 75 |
} |
76 | 76 |
// Error |
77 | 77 |
else { |
78 |
return super.logCanNotCompute(selection);
|
|
78 |
return super.logCanNotExecuteCommand(selection);
|
|
79 | 79 |
} |
80 | 80 |
|
81 | 81 |
ChartEditor.openEditor(coocGraph); |
tmp/org.txm.cooccurrence.rcp/plugin.xml (revision 1005) | ||
---|---|---|
28 | 28 |
<adapter |
29 | 29 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
30 | 30 |
</adapter> |
31 |
<adapter |
|
32 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
33 |
</adapter> |
|
31 | 34 |
</factory> |
32 | 35 |
</extension> |
33 | 36 |
<extension |
... | ... | |
101 | 104 |
style="push"> |
102 | 105 |
</command> |
103 | 106 |
</menuContribution> |
107 |
<menuContribution |
|
108 |
locationURI="popup:org.txm.index.rcp.editors.DictionnaryEditor"> |
|
109 |
<command |
|
110 |
commandId="org.txm.cooccurrence.rcp.handlers.ComputeCooccurrences" |
|
111 |
icon="icons/cooccurrences.png" |
|
112 |
label="%command.name.4" |
|
113 |
style="push"> |
|
114 |
</command> |
|
115 |
</menuContribution> |
|
104 | 116 |
</extension> |
105 | 117 |
<extension |
106 | 118 |
point="org.eclipse.ui.editors"> |
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java (revision 1005) | ||
---|---|---|
125 | 125 |
} |
126 | 126 |
// Error |
127 | 127 |
else { |
128 |
return this.logCanNotCompute(selection);
|
|
128 |
return this.logCanNotExecuteCommand(selection);
|
|
129 | 129 |
} |
130 | 130 |
} |
131 | 131 |
|
tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/adapters/CooccurrenceAdapterFactory.java (revision 1005) | ||
---|---|---|
26 | 26 |
|
27 | 27 |
@Override |
28 | 28 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
29 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Cooccurrence) {
|
|
29 |
if(this.canAdapt(adapterType) && adaptableObject instanceof Cooccurrence) {
|
|
30 | 30 |
return new TXMResultAdapter() { |
31 | 31 |
@Override |
32 | 32 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/adapters/CAAdapterFactory.java (revision 1005) | ||
---|---|---|
33 | 33 |
*/ |
34 | 34 |
@Override |
35 | 35 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
36 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof CA) {
|
|
36 |
if(this.canAdapt(adapterType) && adaptableObject instanceof CA) {
|
|
37 | 37 |
return new TXMResultAdapter() { |
38 | 38 |
@Override |
39 | 39 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.ca.rcp/plugin.xml (revision 1005) | ||
---|---|---|
120 | 120 |
<adapter |
121 | 121 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
122 | 122 |
</adapter> |
123 |
<adapter |
|
124 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
125 |
</adapter> |
|
123 | 126 |
</factory> |
124 | 127 |
</extension> |
125 | 128 |
<extension |
tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/ComputeLexicon.java (revision 1005) | ||
---|---|---|
54 | 54 |
// index = (Index) selection; |
55 | 55 |
// } |
56 | 56 |
else { |
57 |
super.logCanNotCompute(selection);
|
|
57 |
super.logCanNotExecuteCommand(selection);
|
|
58 | 58 |
} |
59 | 59 |
|
60 | 60 |
open(index); |
tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/ComputeIndex.java (revision 1005) | ||
---|---|---|
79 | 79 |
index = (Index) selection; |
80 | 80 |
} |
81 | 81 |
else { |
82 |
return super.logCanNotCompute(selection);
|
|
82 |
return super.logCanNotExecuteCommand(selection);
|
|
83 | 83 |
} |
84 | 84 |
} |
85 | 85 |
|
tmp/org.txm.index.rcp/src/org/txm/index/rcp/adapters/IndexAdapterFactory.java (revision 1005) | ||
---|---|---|
26 | 26 |
|
27 | 27 |
@Override |
28 | 28 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
29 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Index) {
|
|
29 |
if(this.canAdapt(adapterType) && adaptableObject instanceof Index) {
|
|
30 | 30 |
return new TXMResultAdapter() { |
31 | 31 |
@Override |
32 | 32 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.index.rcp/src/org/txm/index/rcp/adapters/LexiconAdapterFactory.java (revision 1005) | ||
---|---|---|
25 | 25 |
|
26 | 26 |
@Override |
27 | 27 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
28 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Lexicon) {
|
|
28 |
if(this.canAdapt(adapterType) && adaptableObject instanceof Lexicon) {
|
|
29 | 29 |
return new TXMResultAdapter() { |
30 | 30 |
@Override |
31 | 31 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.index.rcp/plugin.xml (revision 1005) | ||
---|---|---|
172 | 172 |
<adapter |
173 | 173 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
174 | 174 |
</adapter> |
175 |
<adapter |
|
176 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
177 |
</adapter> |
|
175 | 178 |
</factory> |
176 | 179 |
<factory |
177 | 180 |
adaptableType="org.txm.index.core.functions.Lexicon" |
... | ... | |
179 | 182 |
<adapter |
180 | 183 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
181 | 184 |
</adapter> |
185 |
<adapter |
|
186 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
187 |
</adapter> |
|
182 | 188 |
</factory> |
183 | 189 |
</extension> |
184 | 190 |
<extension |
... | ... | |
315 | 321 |
commandId="org.txm.cooccurrence.rcp.handlers.ComputeCooccurrences"> |
316 | 322 |
<activeWhen> |
317 | 323 |
<and> |
324 |
<or> |
|
318 | 325 |
<reference |
319 | 326 |
definitionId="IndexEditorActive"> |
320 | 327 |
</reference> |
321 | 328 |
<reference |
329 |
definitionId="LexiconEditorActive"> |
|
330 |
</reference> |
|
331 |
</or> |
|
332 |
<reference |
|
322 | 333 |
definitionId="SendSelectionContextNotActive"> |
323 | 334 |
</reference> |
324 | 335 |
</and> |
tmp/org.txm.progression.rcp/plugin.xml (revision 1005) | ||
---|---|---|
127 | 127 |
<adapter |
128 | 128 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
129 | 129 |
</adapter> |
130 |
<adapter |
|
131 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
132 |
</adapter> |
|
130 | 133 |
</factory> |
131 | 134 |
</extension> |
132 | 135 |
<extension |
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java (revision 1005) | ||
---|---|---|
83 | 83 |
} |
84 | 84 |
// Error |
85 | 85 |
else { |
86 |
return this.logCanNotCompute(selection);
|
|
86 |
return this.logCanNotExecuteCommand(selection);
|
|
87 | 87 |
} |
88 | 88 |
} |
89 | 89 |
|
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/adapters/ProgressionAdapterFactory.java (revision 1005) | ||
---|---|---|
2 | 2 |
package org.txm.progression.rcp.adapters; |
3 | 3 |
|
4 | 4 |
import org.eclipse.jface.resource.ImageDescriptor; |
5 |
import org.eclipse.ui.model.IWorkbenchAdapter; |
|
6 | 5 |
import org.eclipse.ui.plugin.AbstractUIPlugin; |
7 | 6 |
import org.osgi.framework.FrameworkUtil; |
8 | 7 |
import org.txm.progression.core.functions.Progression; |
... | ... | |
25 | 24 |
|
26 | 25 |
@Override |
27 | 26 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
28 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Progression) {
|
|
27 |
if(this.canAdapt(adapterType) && adaptableObject instanceof Progression) {
|
|
29 | 28 |
return new TXMResultAdapter() { |
30 | 29 |
@Override |
31 | 30 |
public ImageDescriptor getImageDescriptor(Object object) { |
32 |
// TODO Auto-generated method stub |
|
33 | 31 |
return ICON; |
34 | 32 |
} |
35 | 33 |
}; |
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_ru.properties (revision 1005) | ||
---|---|---|
11 | 11 |
ProgressionPreferencePage_3 = Кумулятивный граф прогрессии |
12 | 12 |
ProgressionPreferencePage_6 = Повторять значения с свойств структур |
13 | 13 |
ProgressionPreferencePage_7 = Масштаб границ структур |
14 |
|
|
15 |
error_thatQueryIsAlreadyRepresentedByACurveInTheGraphic = |
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_fr.properties (revision 1005) | ||
---|---|---|
11 | 11 |
ProgressionPreferencePage_3 = Graphique de progression cumulatif par défault |
12 | 12 |
ProgressionPreferencePage_6 = Répéter les valeurs de propriétés de structures |
13 | 13 |
ProgressionPreferencePage_7 = Échelle des limites de structures |
14 |
|
|
15 |
error_thatQueryIsAlreadyRepresentedByACurveInTheGraphic = Cette requête est déjà présente dans le graphique. |
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java (revision 1005) | ||
---|---|---|
27 | 27 |
public static String ProgressionDialog_3; |
28 | 28 |
public static String ProgressionDialog_7; |
29 | 29 |
|
30 |
|
|
31 |
public static String error_thatQueryIsAlreadyRepresentedByACurveInTheGraphic; |
|
32 |
|
|
30 | 33 |
static { |
31 | 34 |
// initializes resource bundle |
32 | 35 |
Utf8NLS.initializeMessages(BUNDLE_NAME, ProgressionUIMessages.class); |
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages.properties (revision 1005) | ||
---|---|---|
11 | 11 |
ProgressionPreferencePage_3 = Default chart type is cumulative |
12 | 12 |
ProgressionPreferencePage_6 = Repeat the values of the structure properties |
13 | 13 |
ProgressionPreferencePage_7 = Bande size multiplier |
14 |
|
|
15 |
error_thatQueryIsAlreadyRepresentedByACurveInTheGraphic = That query is already represented by a curve in the graphic. Please use another query. |
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java (revision 1005) | ||
---|---|---|
8 | 8 |
import java.util.List; |
9 | 9 |
import java.util.Properties; |
10 | 10 |
|
11 |
import org.eclipse.jface.dialogs.MessageDialog; |
|
11 | 12 |
import org.eclipse.swt.SWT; |
12 | 13 |
import org.eclipse.swt.custom.ScrolledComposite; |
13 | 14 |
import org.eclipse.swt.events.KeyEvent; |
... | ... | |
25 | 26 |
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences; |
26 | 27 |
import org.txm.chartsengine.r.core.themes.DefaultTheme; |
27 | 28 |
import org.txm.chartsengine.rcp.editors.ChartEditor; |
29 |
import org.txm.core.messages.TXMCoreMessages; |
|
28 | 30 |
import org.txm.core.results.Parameter; |
29 | 31 |
import org.txm.core.results.TXMResult; |
30 | 32 |
import org.txm.progression.core.functions.Progression; |
... | ... | |
39 | 41 |
import org.txm.rcp.swt.widget.structures.StructuralUnitPropertiesComboViewer; |
40 | 42 |
import org.txm.rcp.swt.widget.structures.StructuralUnitsComboViewer; |
41 | 43 |
import org.txm.rcp.swt.widget.structures.StructuralUnitsCombosGroup; |
42 |
import org.txm.searchengine.cqp.corpus.Corpus; |
|
43 | 44 |
import org.txm.searchengine.cqp.corpus.query.Query; |
44 | 45 |
import org.txm.utils.io.IOUtils; |
45 | 46 |
import org.txm.utils.logger.Log; |
... | ... | |
523 | 524 |
|
524 | 525 |
if(count > maxCount) { |
525 | 526 |
Log.info("The query already exists: " + query); |
527 |
MessageDialog d = new MessageDialog(getShell(), TXMCoreMessages.error_error2, null, |
|
528 |
ProgressionUIMessages.error_thatQueryIsAlreadyRepresentedByACurveInTheGraphic, 0, new String[] { TXMCoreMessages.common_ok}, 0); |
|
529 |
d.open(); |
|
526 | 530 |
return true; |
527 | 531 |
} |
528 | 532 |
return false; |
tmp/org.txm.textsbalance.rcp/plugin.xml (revision 1005) | ||
---|---|---|
101 | 101 |
<adapter |
102 | 102 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
103 | 103 |
</adapter> |
104 |
<adapter |
|
105 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
106 |
</adapter> |
|
104 | 107 |
</factory> |
105 | 108 |
</extension> |
106 | 109 |
|
tmp/org.txm.textsbalance.rcp/src/org/txm/textsbalance/rcp/adapters/TextsBalanceAdapterFactory.java (revision 1005) | ||
---|---|---|
26 | 26 |
|
27 | 27 |
@Override |
28 | 28 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
29 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof TextsBalance) {
|
|
29 |
if(this.canAdapt(adapterType) && adaptableObject instanceof TextsBalance) {
|
|
30 | 30 |
return new TXMResultAdapter() { |
31 | 31 |
@Override |
32 | 32 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.concordance.rcp/plugin.xml (revision 1005) | ||
---|---|---|
12 | 12 |
<adapter |
13 | 13 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
14 | 14 |
</adapter> |
15 |
<adapter |
|
16 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
17 |
</adapter> |
|
15 | 18 |
</factory> |
16 | 19 |
</extension> |
17 | 20 |
<extension |
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/adapters/ConcordanceAdapterFactory.java (revision 1005) | ||
---|---|---|
26 | 26 |
|
27 | 27 |
@Override |
28 | 28 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
29 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Concordance) {
|
|
29 |
if(this.canAdapt(adapterType) && adaptableObject instanceof Concordance) {
|
|
30 | 30 |
return new TXMResultAdapter() { |
31 | 31 |
@Override |
32 | 32 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java (revision 1005) | ||
---|---|---|
76 | 76 |
} |
77 | 77 |
// Error |
78 | 78 |
else { |
79 |
return this.logCanNotCompute(selection);
|
|
79 |
return this.logCanNotExecuteCommand(selection);
|
|
80 | 80 |
} |
81 | 81 |
} |
82 | 82 |
|
tmp/org.txm.referencer.rcp/plugin.xml (revision 1005) | ||
---|---|---|
102 | 102 |
<adapter |
103 | 103 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
104 | 104 |
</adapter> |
105 |
<adapter |
|
106 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
107 |
</adapter> |
|
105 | 108 |
</factory> |
106 | 109 |
</extension> |
107 | 110 |
<extension |
tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/handlers/ComputeReferencer.java (revision 1005) | ||
---|---|---|
63 | 63 |
} |
64 | 64 |
// Error |
65 | 65 |
else { |
66 |
return super.logCanNotCompute(selection);
|
|
66 |
return super.logCanNotExecuteCommand(selection);
|
|
67 | 67 |
} |
68 | 68 |
|
69 | 69 |
TXMEditor.openEditor(referencer, ReferencerEditor.class.getName()); |
tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/adapters/ReferencerAdapterFactory.java (revision 1005) | ||
---|---|---|
24 | 24 |
|
25 | 25 |
@Override |
26 | 26 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
27 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Referencer) {
|
|
27 |
if(this.canAdapt(adapterType) && adaptableObject instanceof Referencer) {
|
|
28 | 28 |
return new TXMResultAdapter() { |
29 | 29 |
@Override |
30 | 30 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java (revision 1005) | ||
---|---|---|
107 | 107 |
super(corpus); |
108 | 108 |
|
109 | 109 |
this.name = corpus.getName()+ "_" + structure.getName() + "_" + property.getName(); //$NON-NLS-1$ //$NON-NLS-2$ |
110 |
|
|
110 | 111 |
Log.finest(NLS.bind(TXMCoreMessages.NEW_PARTION, this.getCorpus(), this.name)); |
112 |
|
|
111 | 113 |
long start = System.currentTimeMillis(); |
112 | 114 |
this.structure = structure; |
113 | 115 |
this.property = property; |
tmp/org.txm.queryindex.rcp/plugin.xml (revision 1005) | ||
---|---|---|
20 | 20 |
<adapter |
21 | 21 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
22 | 22 |
</adapter> |
23 |
<adapter |
|
24 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
25 |
</adapter> |
|
23 | 26 |
</factory> |
24 | 27 |
</extension> |
25 | 28 |
|
tmp/org.txm.lexicaltable.rcp/plugin.xml (revision 1005) | ||
---|---|---|
176 | 176 |
<adapter |
177 | 177 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
178 | 178 |
</adapter> |
179 |
<adapter |
|
180 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
181 |
</adapter> |
|
179 | 182 |
</factory> |
180 | 183 |
<factory |
181 | 184 |
adaptableType="org.txm.functions.intertextualdistance.InterTextDistance" |
... | ... | |
183 | 186 |
<adapter |
184 | 187 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
185 | 188 |
</adapter> |
189 |
<adapter |
|
190 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
191 |
</adapter> |
|
186 | 192 |
</factory> |
187 | 193 |
</extension> |
188 | 194 |
<extension |
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java (revision 1005) | ||
---|---|---|
168 | 168 |
} |
169 | 169 |
// Error |
170 | 170 |
else { |
171 |
this.logCanNotCompute(selection);
|
|
171 |
this.logCanNotExecuteCommand(selection);
|
|
172 | 172 |
} |
173 | 173 |
|
174 | 174 |
TXMEditor.openEditor(lexicalTable, LexicalTableEditor.class.getName()); |
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/adapters/InterTextDistanceAdapterFactory.java (revision 1005) | ||
---|---|---|
26 | 26 |
|
27 | 27 |
@Override |
28 | 28 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
29 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof InterTextDistance) {
|
|
29 |
if(this.canAdapt(adapterType) && adaptableObject instanceof InterTextDistance) {
|
|
30 | 30 |
return new TXMResultAdapter() { |
31 | 31 |
@Override |
32 | 32 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/adapters/LexicalTableAdapterFactory.java (revision 1005) | ||
---|---|---|
26 | 26 |
|
27 | 27 |
@Override |
28 | 28 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
29 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof LexicalTable) {
|
|
29 |
if(this.canAdapt(adapterType) && adaptableObject instanceof LexicalTable) {
|
|
30 | 30 |
return new TXMResultAdapter() { |
31 | 31 |
@Override |
32 | 32 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/handlers/ComputeProperties.java (revision 1005) | ||
---|---|---|
66 | 66 |
} |
67 | 67 |
// Error |
68 | 68 |
else { |
69 |
return super.logCanNotCompute(selection);
|
|
69 |
return super.logCanNotExecuteCommand(selection);
|
|
70 | 70 |
} |
71 | 71 |
|
72 | 72 |
TXMEditor.openEditor(information, PropertiesEditor.class.getName()); |
tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/adapters/PropertiesAdapterFactory.java (revision 1005) | ||
---|---|---|
25 | 25 |
|
26 | 26 |
@Override |
27 | 27 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
28 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Properties) {
|
|
28 |
if(this.canAdapt(adapterType) && adaptableObject instanceof Properties) {
|
|
29 | 29 |
return new TXMResultAdapter() { |
30 | 30 |
@Override |
31 | 31 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.properties.rcp/plugin.xml (revision 1005) | ||
---|---|---|
37 | 37 |
<adapter |
38 | 38 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
39 | 39 |
</adapter> |
40 |
<adapter |
|
41 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
42 |
</adapter> |
|
40 | 43 |
</factory> |
41 | 44 |
</extension> |
42 | 45 |
<extension |
tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/SendEditionTo.java (revision 1005) | ||
---|---|---|
48 | 48 |
|
49 | 49 |
IEditionEditor editor = (IEditionEditor) this.getActiveEditor(event); |
50 | 50 |
String query = ((IEditionEditor)editor).getTextSelection(); |
51 |
query = query.replaceAll("\n", "").trim(); |
|
52 |
query = "\"" + Query.addBackSlash(query) + "\""; |
|
51 |
query = query.replaceAll("\n", "").trim(); //$NON-NLS-1$ //$NON-NLS-2$
|
|
52 |
query = "\"" + Query.addBackSlash(query) + "\""; //$NON-NLS-1$ //$NON-NLS-2$
|
|
53 | 53 |
return query; |
54 | 54 |
} |
55 | 55 |
|
tmp/org.txm.wordcloud.rcp/plugin.xml (revision 1005) | ||
---|---|---|
114 | 114 |
<adapter |
115 | 115 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
116 | 116 |
</adapter> |
117 |
<adapter |
|
118 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
119 |
</adapter> |
|
117 | 120 |
</factory> |
118 | 121 |
</extension> |
119 | 122 |
<extension |
tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/handlers/ComputeWordCloud.java (revision 1005) | ||
---|---|---|
101 | 101 |
} |
102 | 102 |
// Error |
103 | 103 |
else { |
104 |
return super.logCanNotCompute(selection);
|
|
104 |
return super.logCanNotExecuteCommand(selection);
|
|
105 | 105 |
} |
106 | 106 |
|
107 | 107 |
} |
tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/adapters/WordCloudAdapterFactory.java (revision 1005) | ||
---|---|---|
26 | 26 |
|
27 | 27 |
@Override |
28 | 28 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
29 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof WordCloud) {
|
|
29 |
if(this.canAdapt(adapterType) && adaptableObject instanceof WordCloud) {
|
|
30 | 30 |
return new TXMResultAdapter() { |
31 | 31 |
@Override |
32 | 32 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/handlers/ComputePartitionDimensionsBarChart.java (revision 1005) | ||
---|---|---|
79 | 79 |
} |
80 | 80 |
// Error |
81 | 81 |
else { |
82 |
return super.logCanNotCompute(selection);
|
|
82 |
return super.logCanNotExecuteCommand(selection);
|
|
83 | 83 |
} |
84 | 84 |
|
85 | 85 |
// FIXME: Pie chart tests |
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/adapters/PartitionAdapterFactory.java (revision 1005) | ||
---|---|---|
26 | 26 |
|
27 | 27 |
@Override |
28 | 28 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
29 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Partition) {
|
|
29 |
if(this.canAdapt(adapterType) && adaptableObject instanceof Partition) {
|
|
30 | 30 |
return new TXMResultAdapter() { |
31 | 31 |
@Override |
32 | 32 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/adapters/PartitionDimensionsAdapterFactory.java (revision 1005) | ||
---|---|---|
26 | 26 |
|
27 | 27 |
@Override |
28 | 28 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
29 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof PartitionDimensions) {
|
|
29 |
if(this.canAdapt(adapterType) && adaptableObject instanceof PartitionDimensions) {
|
|
30 | 30 |
return new TXMResultAdapter() { |
31 | 31 |
@Override |
32 | 32 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.partition.rcp/plugin.xml (revision 1005) | ||
---|---|---|
105 | 105 |
<adapter |
106 | 106 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
107 | 107 |
</adapter> |
108 |
<adapter |
|
109 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
110 |
</adapter> |
|
108 | 111 |
</factory> |
109 | 112 |
<factory |
110 | 113 |
adaptableType="org.txm.searchengine.cqp.corpus.Partition" |
... | ... | |
112 | 115 |
<adapter |
113 | 116 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
114 | 117 |
</adapter> |
118 |
<adapter |
|
119 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
120 |
</adapter> |
|
115 | 121 |
</factory> |
116 | 122 |
</extension> |
117 | 123 |
<extension |
tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToQueryable.java (revision 1005) | ||
---|---|---|
30 | 30 |
import org.eclipse.core.commands.ExecutionEvent; |
31 | 31 |
import org.eclipse.core.commands.ExecutionException; |
32 | 32 |
import org.eclipse.jface.viewers.ISelection; |
33 |
import org.eclipse.jface.viewers.IStructuredSelection; |
|
34 | 33 |
import org.eclipse.ui.handlers.HandlerUtil; |
35 | 34 |
import org.txm.core.preferences.TXMPreferences; |
36 | 35 |
import org.txm.core.results.TXMResult; |
... | ... | |
38 | 37 |
import org.txm.utils.logger.Log; |
39 | 38 |
|
40 | 39 |
/** |
41 |
* Base command to send a selection to a command that needs a query to compute the new result.
|
|
40 |
* Base command to send a selection to a command that needs one or more queries to compute the new result.
|
|
42 | 41 |
* |
43 | 42 |
* @author mdecorde |
44 | 43 |
* @author sjacquot |
... | ... | |
68 | 67 |
@Override |
69 | 68 |
public Object execute(ExecutionEvent event) throws ExecutionException { |
70 | 69 |
|
71 |
ISelection isel = HandlerUtil.getCurrentSelection(event);
|
|
70 |
ISelection selection = HandlerUtil.getCurrentSelection(event);
|
|
72 | 71 |
|
73 |
// IStructuredSelection selection = (IStructuredSelection) isel; |
|
74 |
// if (selection != null) { |
|
72 |
if (selection != null) { |
|
75 | 73 |
|
76 |
String query = this.createQuery(event, isel); |
|
77 |
String queries = null; |
|
78 |
if (query == null) { |
|
79 |
queries = this.createQueries(event, isel); |
|
80 |
} |
|
74 |
String query = this.createQuery(event, selection); |
|
75 |
String queries = this.createQueries(event, selection); |
|
81 | 76 |
|
82 | 77 |
if(query.isEmpty() && queries.isEmpty()) { |
83 | 78 |
Log.severe("No query was set, command canceled."); |
... | ... | |
92 | 87 |
|
93 | 88 |
BaseAbstractHandler.executeSendToCommand(event.getCommand().getId(), uuid); |
94 | 89 |
|
95 |
// }
|
|
96 |
// else {
|
|
97 |
// this.logCanNotCompute(selection);
|
|
98 |
// }
|
|
90 |
} |
|
91 |
else { |
|
92 |
this.logCanNotExecuteCommand(selection);
|
|
93 |
} |
|
99 | 94 |
return null; |
100 | 95 |
} |
101 | 96 |
|
tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToMatchable.java (revision 1005) | ||
---|---|---|
79 | 79 |
BaseAbstractHandler.executeSendToCommand(event.getCommand().getId(), uuid); |
80 | 80 |
} |
81 | 81 |
else { |
82 |
this.logCanNotCompute(selection);
|
|
82 |
this.logCanNotExecuteCommand(selection);
|
|
83 | 83 |
} |
84 | 84 |
return null; |
85 | 85 |
} |
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java (revision 1005) | ||
---|---|---|
32 | 32 |
*/ |
33 | 33 |
@Override |
34 | 34 |
public Object getAdapter(Object adaptableObject, Class adapterType) { |
35 |
if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof AHC) {
|
|
35 |
if(this.canAdapt(adapterType) && adaptableObject instanceof AHC) {
|
|
36 | 36 |
return new TXMResultAdapter() { |
37 | 37 |
@Override |
38 | 38 |
public ImageDescriptor getImageDescriptor(Object object) { |
tmp/org.txm.ahc.rcp/plugin.xml (revision 1005) | ||
---|---|---|
101 | 101 |
<adapter |
102 | 102 |
type="org.eclipse.ui.model.IWorkbenchAdapter"> |
103 | 103 |
</adapter> |
104 |
<adapter |
|
105 |
type="org.eclipse.ui.model.IWorkbenchAdapter2"> |
|
106 |
</adapter> |
|
104 | 107 |
</factory> |
105 | 108 |
</extension> |
106 | 109 |
<extension |
tmp/org.txm.core/src/java/org/txm/Toolbox.java (revision 1005) | ||
---|---|---|
262 | 262 |
} |
263 | 263 |
pluginsPostinstallation(); |
264 | 264 |
} catch(Exception e) { |
265 |
Log.severe("Error while loading post-installaing plugins.");
|
|
265 |
Log.severe("Error while loading plugins post-installation.");
|
|
266 | 266 |
e.printStackTrace(); |
267 | 267 |
} |
268 | 268 |
|
269 | 269 |
|
270 | 270 |
// FIXME: tmp persistence tests: Reload saved results |
271 |
if (TBXPreferences.getBoolean(TBXPreferences.PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) {
|
|
272 |
Log.finest("Toolbox.initialize(): reloading persitent results...");
|
|
271 |
// if (TBXPreferences.getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) {
|
|
272 |
Log.info("Toolbox.initialize(): reloading persitent results...");
|
|
273 | 273 |
ArrayList<String> resultsNodesQualifiers = TXMPreferences.getAllResultsNodesQualifiers(); |
274 | 274 |
for (String nodeQualifier : resultsNodesQualifiers) { |
275 | 275 |
|
... | ... | |
291 | 291 |
String className = TXMPreferences.getString("class", nodeQualifier); //$NON-NLS-1$ |
292 | 292 |
Class<?> cl = bundle.loadClass(className); |
293 | 293 |
Constructor<?> cons = cl.getConstructor(String.class); |
294 |
cons.newInstance(nodeQualifier); |
|
294 |
TXMResult result = (TXMResult) cons.newInstance(nodeQualifier); |
|
295 |
result.setUserPersistable(true); |
|
296 |
|
|
295 | 297 |
} |
296 | 298 |
catch (Exception e) { |
297 | 299 |
// TODO Auto-generated catch block |
298 | 300 |
e.printStackTrace(); |
299 | 301 |
} |
300 | 302 |
} |
301 |
} |
|
303 |
// }
|
|
302 | 304 |
|
303 | 305 |
|
304 | 306 |
|
... | ... | |
498 | 500 |
// FIXME: tmp solution before IProject: remove all not persistable result nodes |
499 | 501 |
//TXMPreferences.deleteAllNotPersistableResultsNodes(); |
500 | 502 |
// FIXME: tmp solution before IProject: remove result local nodes if persistence preference is disabled |
501 |
if (!TBXPreferences.getBoolean(TBXPreferences.PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) { |
|
502 |
TXMPreferences.deleteAllResultsNodes(); |
|
503 |
} |
|
504 |
|
|
503 |
// if (!TBXPreferences.getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) { |
|
504 |
// TXMPreferences.deleteAllResultsNodes(); |
|
505 |
// } |
|
506 |
// FIXME: other tmp solution |
|
507 |
TXMResult.deleteAllNonPersistentResults(); |
|
505 | 508 |
|
509 |
|
|
506 | 510 |
if(Toolbox.workspace != null) { |
507 | 511 |
Toolbox.workspace.save(); |
508 | 512 |
} |
... | ... | |
518 | 522 |
} |
519 | 523 |
} |
520 | 524 |
|
525 |
|
|
521 | 526 |
/** |
522 | 527 |
* Shut the toolbox workspace down. |
523 | 528 |
*/ |
tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 1005) | ||
---|---|---|
115 | 115 |
MemCqiClient_7 = Unknown CQP code: b1 |
116 | 116 |
MemCqiClient_9 = b2 |
117 | 117 |
|
118 |
NEW_PARTION = Creating new partion of corpus {0}: {1} |
|
118 |
NEW_PARTION = Creating new partion of corpus {0}: {1}.
|
|
119 | 119 |
|
120 | 120 |
NetCqiClient_1 = getLastCQiError: |
121 | 121 |
NetCqiClient_3 = getLastCQPError: |
... | ... | |
309 | 309 |
common_structure = Structure |
310 | 310 |
common_units = Units |
311 | 311 |
|
312 |
error_error = ** Error: {0}. |
|
312 |
error_error = ** Error: {0}. |
|
313 |
error_error2 = Error |
|
313 | 314 |
|
314 | 315 |
info_deletingPartition = Deleting partition {0}. |
tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties (revision 1005) | ||
---|---|---|
1 | 1 |
|
2 |
ApplicationWorkbenchAdvisor_13 = ** Не удалось создать папку TXMHOME : {0} |
|
3 |
ApplicationWorkbenchAdvisor_39 = Не хватает папки в директории установки TXM : {0} |
|
4 |
ApplicationWorkbenchAdvisor_40 = ** Не удалось скопировать файлы из папки TXMINSTALL в TXMHOME: {0} |
|
5 |
|
|
2 | 6 |
common_delete = удалить |
3 | 7 |
common_description = Описание |
4 | 8 |
common_frequency = Частотность |
... | ... | |
13 | 17 |
common_structure = Структура |
14 | 18 |
common_units = Единицы |
15 | 19 |
|
16 |
ApplicationWorkbenchAdvisor_13 = ** Не удалось создать папку TXMHOME : {0} |
|
17 |
ApplicationWorkbenchAdvisor_39 = Не хватает папки в директории установки TXM : {0} |
|
18 |
ApplicationWorkbenchAdvisor_40 = ** Не удалось скопировать файлы из папки TXMINSTALL в TXMHOME: {0} |
|
20 |
error_error2 = |
tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 1005) | ||
---|---|---|
25 | 25 |
public static String common_mode; |
26 | 26 |
public static String common_numberOfLines; |
27 | 27 |
public static String common_ok; |
28 |
|
|
28 | 29 |
public static String common_pleaseWait; |
29 | 30 |
public static String common_properties; |
30 | 31 |
public static String common_property; |
... | ... | |
37 | 38 |
public static String common_frequency; |
38 | 39 |
|
39 | 40 |
public static String error_error; |
41 |
public static String error_error2; |
|
40 | 42 |
|
41 | 43 |
public static String ApplicationWorkbenchAdvisor_13; |
42 | 44 |
public static String ApplicationWorkbenchAdvisor_14; |
tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties (revision 1005) | ||
---|---|---|
81 | 81 |
|
82 | 82 |
Error_CONNECTION_FAILED = ** Echec de connexion au moteur de recherche avec les paramètres suivants : |
83 | 83 |
|
84 |
|
|
85 | 84 |
FMAX_1 = Fmax |
86 | 85 |
|
87 | 86 |
FilterManager_0 = ** Erreur du gestionnaire de filtre : initialisation |
... | ... | |
110 | 109 |
MemCqiClient_7 = Code CQP inconnu : b1 |
111 | 110 |
MemCqiClient_9 = b2 |
112 | 111 |
|
113 |
NEW_PARTION = Création d''une nouvelle partition du corpus {0} : {1} |
|
112 |
NEW_PARTION = Création d''une nouvelle partition du corpus {0} : {1}.
|
|
114 | 113 |
|
115 | 114 |
NetCqiClient_1 = Dernière erreur Cqi : |
116 | 115 |
NetCqiClient_3 = Dernière erreur CQP : |
... | ... | |
297 | 296 |
common_structure = Structure |
298 | 297 |
common_units = Unités |
299 | 298 |
|
300 |
error_error = ** Erreur : {0}. |
|
299 |
error_error = ** Erreur : {0}. |
|
300 |
error_error2 = Erreur |
|
301 | 301 |
|
302 | 302 |
info_deletingPartition = Suppression de la partition {0}. |
tmp/org.txm.core/src/java/org/txm/core/engines/EngineType.java (revision 1005) | ||
---|---|---|
24 | 24 |
final private String description; |
25 | 25 |
|
26 | 26 |
/** |
27 |
* |
|
27 |
* Creates a new engine type.
|
|
28 | 28 |
* @param description |
29 | 29 |
*/ |
30 | 30 |
private EngineType(String description) { |
tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java (revision 1005) | ||
---|---|---|
8 | 8 |
import java.io.Serializable; |
9 | 9 |
import java.util.ArrayList; |
10 | 10 |
import java.util.Arrays; |
11 |
import java.util.Collections; |
|
11 | 12 |
import java.util.HashMap; |
12 | 13 |
import java.util.Iterator; |
13 | 14 |
import java.util.Set; |
... | ... | |
1197 | 1198 |
} catch (Exception e) { |
1198 | 1199 |
e.printStackTrace(); |
1199 | 1200 |
} |
1200 |
|
|
1201 |
Collections.sort(resultsNodesQualifiers); |
|
1201 | 1202 |
return resultsNodesQualifiers; |
1202 | 1203 |
} |
1203 | 1204 |
|
tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java (revision 1005) | ||
---|---|---|
50 | 50 |
public static final String EXPORT_ENCODING = "export_encoding"; //$NON-NLS-1$ |
51 | 51 |
|
52 | 52 |
/** The Constant EXPORT_COLSEPARATOR. */ |
53 |
public static final String EXPORT_COLSEPARATOR = "export_colseparator"; //$NON-NLS-1$ |
|
53 |
public static final String EXPORT_COL_SEPARATOR = "export_colseparator"; //$NON-NLS-1$
|
|
54 | 54 |
/** The Constant EXPORT_TXTSEPARATOR. */ |
55 |
public static final String EXPORT_TXTSEPARATOR = "export_txtseparator"; //$NON-NLS-1$ |
|
55 |
public static final String EXPORT_TXT_SEPARATOR = "export_txtseparator"; //$NON-NLS-1$
|
|
56 | 56 |
|
57 | 57 |
|
58 | 58 |
/** |
... | ... | |
64 | 64 |
/** |
65 | 65 |
* To enable/disable the results persistence (save after a computing and load at Toolbox start). |
66 | 66 |
*/ |
67 |
public static final String PERSISTENCE_ENABLED = "persistence_enabled"; //$NON-NLS-1$
|
|
67 |
public static final String AUTO_PERSISTENCE_ENABLED = "auto_persistence_enabled"; //$NON-NLS-1$
|
|
68 | 68 |
|
69 | 69 |
@Override |
70 | 70 |
public void initializeDefaultPreferences() { |
... | ... | |
89 | 89 |
preferences.put(TBXPreferences.METADATA_COLSEPARATOR, ","); //$NON-NLS-1$ |
90 | 90 |
preferences.put(TBXPreferences.EMPTY_PROPERTY_VALUE_CODE, "__UNDEF__"); //$NON-NLS-1$ |
91 | 91 |
|
92 |
preferences.put(EXPORT_COLSEPARATOR, "\t"); //$NON-NLS-1$ |
|
92 |
preferences.put(EXPORT_COL_SEPARATOR, "\t"); //$NON-NLS-1$
|
|
93 | 93 |
preferences.put(EXPORT_ENCODING, System.getProperty("file.encoding")); //$NON-NLS-1$ |
94 |
preferences.put(EXPORT_TXTSEPARATOR, ""); //$NON-NLS-1$ |
|
94 |
preferences.put(EXPORT_TXT_SEPARATOR, ""); //$NON-NLS-1$
|
|
95 | 95 |
preferences.putBoolean(EXPORT_SHOW, false); |
96 | 96 |
|
97 | 97 |
preferences.putBoolean(SHOW_ALL_RESULT_NODES, false); |
98 |
preferences.putBoolean(PERSISTENCE_ENABLED, true); |
|
98 |
preferences.putBoolean(AUTO_PERSISTENCE_ENABLED, true);
|
|
99 | 99 |
} |
100 | 100 |
} |
tmp/org.txm.core/src/java/org/txm/core/results/comparators/MultipleComparators.java (revision 1005) | ||
---|---|---|
16 | 16 |
*/ |
17 | 17 |
public class MultipleComparators implements Comparator<TXMResult> { |
18 | 18 |
|
19 |
/** |
|
20 |
* Comparators to use. |
|
21 |
*/ |
|
19 | 22 |
protected ArrayList<Comparator<TXMResult>> comparators; |
20 | 23 |
|
21 | 24 |
/** |
25 |
* Creates a comparator dedicated to multiple chained sorting. |
|
26 |
* The comparison process sequentially calls the specified comparator comparison methods. |
|
22 | 27 |
* |
23 | 28 |
* @param comparators |
24 | 29 |
*/ |
tmp/org.txm.core/src/java/org/txm/core/results/comparators/Comparators.java (revision 1005) | ||
---|---|---|
11 | 11 |
|
12 | 12 |
/** |
13 | 13 |
* Class to manage different comparators for a sorting type. |
14 |
* |
|
14 | 15 |
* @author sjacquot |
15 | 16 |
* |
16 | 17 |
*/ |
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 1005) | ||
---|---|---|
136 | 136 |
|
137 | 137 |
|
138 | 138 |
/** |
139 |
* Persistable state.
|
|
139 |
* Internal persistable state.
|
|
140 | 140 |
*/ |
141 | 141 |
protected boolean persistable; |
142 | 142 |
|
143 |
/** |
|
144 |
* User persistable state. |
|
145 |
*/ |
|
146 |
protected boolean userPersistable; |
|
147 |
|
|
143 | 148 |
|
144 | 149 |
/** |
145 | 150 |
* Creates a new TXMResult, child of the specified parent. |
... | ... | |
196 | 201 |
|
197 | 202 |
this.dirty = true; |
198 | 203 |
this.persistable = true; |
204 |
this.userPersistable = false; |
|
199 | 205 |
|
200 | 206 |
|
201 | 207 |
// retrieving parent from UUID |
... | ... | |
964 | 970 |
return false; |
965 | 971 |
} |
966 | 972 |
|
973 |
/** |
|
974 |
* Deletes all non persistent results. |
|
975 |
*/ |
|
976 |
synchronized public static void deleteAllNonPersistentResults() { |
|
977 |
ArrayList<TXMResult> results = Toolbox.workspace.getDeepChildren(); |
|
978 |
for (int i = 0; i < results.size(); i++) { |
|
979 |
if(!results.get(i).mustBePersisted()) { |
|
980 |
Log.finest("TXMResult.deleteAllNonPersistentResults(): Deleting result " + results.get(i).getSimpleName()); |
|
981 |
} |
|
982 |
} |
|
983 |
} |
|
984 |
|
|
967 | 985 |
|
968 | 986 |
/** |
969 | 987 |
* Gets a child specified by its index in the children list. |
... | ... | |
1646 | 1664 |
Log.severe("TXMResult.compute():" + this.getClass().getSimpleName() + ": failed to save parameters for " + this.getName() + "."); |
1647 | 1665 |
} |
1648 | 1666 |
|
1649 |
// FIXME: file persistence flush tests |
|
1650 |
if (this.persistable && TBXPreferences.getBoolean(TBXPreferences.PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) { |
|
1651 |
Log.finest("TXMResult.compute(): flushing local preferences node in file for persistence tests."); |
|
1667 |
// file persistence flush |
|
1668 |
if (this.mustBePersisted()) { |
|
1652 | 1669 |
TXMPreferences.flush(this); |
1653 | 1670 |
} |
1654 | 1671 |
|
... | ... | |
1670 | 1687 |
*/ |
1671 | 1688 |
protected abstract boolean _compute() throws Exception; |
1672 | 1689 |
|
1690 |
|
|
1691 |
/*** |
|
1692 |
* Checks if the result must be persisted according to the persistence global preference or the user persistable state. |
|
1693 |
* @return |
|
1694 |
*/ |
|
1695 |
public boolean mustBePersisted() { |
|
1696 |
return (this.persistable && TBXPreferences.getBoolean(TBXPreferences.AUTO_PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE) |
|
1697 |
|| this.userPersistable); |
|
1698 |
} |
|
1699 |
|
|
1673 | 1700 |
/** |
1674 | 1701 |
* |
1675 | 1702 |
* @return the array of extensions to show in the FileDialog SWT widget |
... | ... | |
1859 | 1886 |
public String getLazyName() { |
1860 | 1887 |
return lazyName; |
1861 | 1888 |
} |
1889 |
|
|
1890 |
/** |
|
1891 |
* @return the userPersistable |
|
1892 |
*/ |
|
1893 |
public boolean isUserPersistable() { |
|
1894 |
return userPersistable; |
|
1895 |
} |
|
1896 |
|
|
1897 |
/** |
|
1898 |
* @param userPersistable the userPersistable to set |
|
1899 |
*/ |
|
1900 |
public void setUserPersistable(boolean userPersistable) { |
|
1901 |
this.userPersistable = userPersistable; |
|
1902 |
Log.finest("TXMResult.setUserPersistable(): " + userPersistable); |
|
1903 |
} |
|
1904 |
|
|
1905 |
/** |
|
1906 |
* Swaps the user persistable state. |
|
1907 |
*/ |
|
1908 |
public void swapUserPersistableState() { |
|
1909 |
this.setUserPersistable(!this.userPersistable); |
|
1910 |
} |
|
1911 |
|
|
1912 |
|
|
1862 | 1913 |
} |
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java (revision 1005) | ||
---|---|---|
53 | 53 |
import org.txm.rcp.messages.TXMUIMessages; |
54 | 54 |
import org.txm.rcp.swt.dialog.LastOpened; |
55 | 55 |
import org.txm.rcp.utils.JobHandler; |
56 |
import org.txm.utils.logger.Log; |
|
56 | 57 |
|
57 | 58 |
/** |
58 | 59 |
* Exports chart using charts engine export. |
... | ... | |
117 | 118 |
try { |
118 | 119 |
file.createNewFile(); |
119 | 120 |
} catch (IOException e1) { |
120 |
System.err.println(NLS.bind(TXMUIMessages.ExportResult_3, file, e1));
|
|
121 |
Log.severe(NLS.bind(TXMUIMessages.ExportResult_3, file, e1));
|
|
121 | 122 |
} |
122 | 123 |
if (!file.canWrite()) { |
123 |
System.err.println(NLS.bind(TXMUIMessages.ExportResult_5, file));
|
|
124 |
Log.severe(NLS.bind(TXMUIMessages.ExportResult_5, file));
|
|
124 | 125 |
} |
125 | 126 |
if (!file.isFile()) { |
126 |
System.err.println("Error: " + file + " is not a file"); //$NON-NLS-1$ //$NON-NLS-2$
|
|
127 |
Log.severe("Error: " + file + " is not a file"); //$NON-NLS-1$ //$NON-NLS-2$
|
|
127 | 128 |
} |
128 | 129 |
|
129 | 130 |
JobHandler jobhandler = new JobHandler(TXMUIMessages.ExportResult_0) { |
... | ... | |
138 | 139 |
|
139 | 140 |
if (file.exists()) { |
140 | 141 |
|
141 |
System.out.println(NLS.bind(TXMUIMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
|
|
142 |
Log.info(NLS.bind(TXMUIMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
|
|
142 | 143 |
|
143 | 144 |
// Open internal editor in the UI thread |
144 | 145 |
if (TXMPreferences.getBoolean(TBXPreferences.EXPORT_SHOW, TBXPreferences.PREFERENCES_NODE)) { |
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditorInput.java (revision 1005) | ||
---|---|---|
2 | 2 |
|
3 | 3 |
import org.eclipse.jface.resource.ImageDescriptor; |
4 | 4 |
import org.eclipse.ui.IPersistableElement; |
5 |
import org.txm.chartsengine.core.ChartsEngine; |
|
6 | 5 |
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences; |
7 | 6 |
import org.txm.chartsengine.core.results.ChartResult; |
8 | 7 |
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider; |
... | ... | |
29 | 28 |
*/ |
30 | 29 |
protected Object chartContainer; |
31 | 30 |
|
32 |
|
|
33 |
//protected Object chart; |
|
34 |
|
|
35 | 31 |
/** |
36 | 32 |
* Creates a chart editor input linked to the current SWT charts components provider. |
37 | 33 |
* @param result |
... | ... | |
64 | 60 |
super(result); |
65 | 61 |
this.swtChartsComponentsProvider = swtComponentsProvider; |
66 | 62 |
this.chartContainer = chartContainer; |
67 |
|
|
68 |
// // check that the charts engine used for the result matches the SWT components provider otherwise fin a suitable components provider |
|
69 |
// ChartsEngine chartsEngine = ChartsEngine.getChartsEngine(result); |
|
70 |
// if(chartsEngine != swtComponentsProvider.getChartsEngine()) { |
|
71 |
// this.swtChartsComponentsProvider = SWTChartsComponentsProvider.getComponentsProvider(chartsEngine); |
|
72 |
// System.err.println("ChartEditorInput.ChartEditorInput(): charts engine used to create the chart is not the current one. The SWT components provider has been changed to match it: " + this.swtChartsComponentsProvider + "."); |
|
73 |
// } |
|
74 |
|
|
75 | 63 |
} |
76 |
|
|
77 | 64 |
|
78 | 65 |
|
79 |
|
|
80 | 66 |
@Override |
81 | 67 |
public boolean exists() { |
82 | 68 |
// TODO Auto-generated method stub |
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/preferences/ChartsEnginePreferences.java (revision 1005) | ||
---|---|---|
19 | 19 |
// auto populate the preference node qualifier from the current bundle id |
20 | 20 |
public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(ChartsEnginePreferences.class).getSymbolicName(); |
21 | 21 |
|
22 |
public static final String PREFERENCES_PREFIX = "charts_engine_"; //$NON-NLS-1$ |
|
23 |
|
|
24 | 22 |
/** |
25 | 23 |
* The name of the current charts engine. |
26 | 24 |
*/ |
27 |
public final static String CURRENT_NAME = PREFERENCES_PREFIX + "current_name"; //$NON-NLS-1$
|
|
25 |
public final static String CURRENT_NAME = "current_name"; //$NON-NLS-1$ |
|
28 | 26 |
|
29 | 27 |
|
30 | 28 |
/** |
31 | 29 |
* Constant for showing title or not in the charts. |
32 | 30 |
*/ |
33 |
public final static String SHOW_TITLE = PREFERENCES_PREFIX + "show_title"; //$NON-NLS-1$
|
|
31 |
public final static String SHOW_TITLE = "show_title"; //$NON-NLS-1$ |
|
34 | 32 |
|
35 | 33 |
|
36 | 34 |
/** |
37 | 35 |
* Constant for showing legend or not in the charts. |
38 | 36 |
*/ |
39 |
public final static String SHOW_LEGEND = PREFERENCES_PREFIX + "show_legend"; //$NON-NLS-1$ |
Formats disponibles : Unified diff