Révision 3628
TXM/trunk/org.txm.cooccurrence.core/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
10 | 10 |
bility:=reexport |
11 | 11 |
Bundle-ActivationPolicy: lazy |
12 | 12 |
Bundle-ManifestVersion: 2 |
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
14 | 14 |
Bundle-Vendor: Textometrie.org |
15 | 15 |
Automatic-Module-Name: org.txm.cooccurrence.core |
16 | 16 |
|
17 | 17 |
TXM/trunk/org.txm.python.rcp/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
5 | 5 |
Bundle-Version: 1.0.0.qualifier |
6 | 6 |
Bundle-Vendor: textometrie.org |
7 | 7 |
Automatic-Module-Name: org.txm.python.rcp |
8 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
8 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
9 | 9 |
Require-Bundle: org.txm.python.core;bundle-version="1.0.0";visibility:=reexport, |
10 |
org.txm.rcp;bundle-version="0.8.2"
|
|
10 |
org.txm.rcp;bundle-version="0.8.3"
|
|
11 | 11 |
Export-Package: org.txm.python.rcp |
12 | 12 |
TXM/trunk/org.txm.concordance.core/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
10 | 10 |
isibility:=reexport,org.txm.statsengine.r.core;bundle-version="1.0.0" |
11 | 11 |
;visibility:=reexport |
12 | 12 |
Bundle-ManifestVersion: 2 |
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
14 | 14 |
Bundle-Vendor: Textometry.org |
15 | 15 |
Automatic-Module-Name: org.txm.concordance.core |
16 | 16 |
|
17 | 17 |
TXM/trunk/org.txm.searchengine.cqp.feature/build.properties (revision 3628) | ||
---|---|---|
1 | 1 |
#Fri Jul 06 10:25:16 CEST 2018 |
2 |
bin.includes=feature.xml |
|
2 |
bin.includes=feature.xml, build.properties |
TXM/trunk/org.txm.searchengine.cqp.feature/feature.xml (revision 3628) | ||
---|---|---|
5 | 5 |
version="1.0.0.qualifier" |
6 | 6 |
provider-name="Textometrie.org" |
7 | 7 |
license-feature="org.txm.rcp.feature" |
8 |
license-feature-version="0.8.2.qualifier">
|
|
8 |
license-feature-version="0.8.3.qualifier">
|
|
9 | 9 |
|
10 | 10 |
<description url="http://www.example.com/description"> |
11 | 11 |
SearchEngine |
12 | 12 |
</description> |
13 | 13 |
|
14 | 14 |
<copyright url="http://www.example.com/copyright"> |
15 |
TXM 0.8.2
|
|
16 |
Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
|
|
15 |
TXM 0.8.3
|
|
16 |
Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
|
|
17 | 17 |
Copyright © 2010-2013 ENS de Lyon. |
18 | 18 |
Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of |
19 | 19 |
Lyon 2, University of Franche-Comté, University of Nice |
... | ... | |
42 | 42 |
<import plugin="org.txm.core"/> |
43 | 43 |
<import plugin="org.txm.searchengine.core" version="1.0.0" match="greaterOrEqual"/> |
44 | 44 |
<import plugin="org.txm.libs.cqp" version="1.0.0" match="greaterOrEqual"/> |
45 |
<import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
|
|
45 |
<import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
|
|
46 | 46 |
<import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/> |
47 | 47 |
</requires> |
48 | 48 |
|
49 | 49 |
TXM/trunk/org.txm.libs.javafx.win32/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
4 | 4 |
Bundle-SymbolicName: org.txm.libs.javafx.win32 |
5 | 5 |
Bundle-Version: 1.0.0.qualifier |
6 | 6 |
Automatic-Module-Name: org.txm.libs.javafx.win32 |
7 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
7 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
8 | 8 |
Bundle-ClassPath: jfxswt.jar, |
9 | 9 |
jfxrt.jar |
10 | 10 |
Export-Package: com.sun.deploy.uitoolkit.impl.fx, |
11 | 11 |
TXM/trunk/org.txm.chartsengine.graphstream.rcp/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
7 | 7 |
Bundle-Version: 1.0.0.qualifier |
8 | 8 |
Require-Bundle: org.txm.chartsengine.graphstream.core;bundle-version=" |
9 | 9 |
1.0.0";visibility:=reexport,org.txm.chartsengine.rcp;bundle-version=" |
10 |
1.0.0";visibility:=reexport,org.txm.rcp;bundle-version="0.8.0";visibi
|
|
10 |
1.0.0";visibility:=reexport,org.txm.rcp;bundle-version="0.8.3";visibi
|
|
11 | 11 |
lity:=reexport,org.txm.cooccurrence.core;bundle-version="1.0.0";visib |
12 | 12 |
ility:=reexport |
13 | 13 |
Bundle-ManifestVersion: 2 |
14 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
14 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
15 | 15 |
Bundle-Vendor: %Bundle-Vendor |
16 | 16 |
Automatic-Module-Name: org.txm.chartsengine.graphstream.rcp |
17 | 17 |
|
18 | 18 |
TXM/trunk/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java (revision 3628) | ||
---|---|---|
1537 | 1537 |
* @throws RException the r exception |
1538 | 1538 |
* @throws REXPMismatchException the rEXP mismatch exception |
1539 | 1539 |
*/ |
1540 |
public REXP safeEval(String expr) throws RserveException, RException, REXPMismatchException { |
|
1540 |
public synchronized REXP safeEval(String expr) throws RserveException, RException, REXPMismatchException {
|
|
1541 | 1541 |
if (logging && inputLogger != null) { |
1542 | 1542 |
inputLogger.printMessage(expr); |
1543 | 1543 |
} |
TXM/trunk/org.txm.statsengine.r.core/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
12 | 12 |
=reexport |
13 | 13 |
Bundle-ActivationPolicy: lazy |
14 | 14 |
Bundle-ManifestVersion: 2 |
15 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
15 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
16 | 16 |
Bundle-Vendor: Textometrie.org |
17 | 17 |
Automatic-Module-Name: org.txm.statsengine.r.core |
18 | 18 |
|
19 | 19 |
TXM/trunk/org.txm.libs.cqp.win32/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
3 | 3 |
Bundle-Name: CQP.win32 |
4 | 4 |
Bundle-Version: 1.1.0.qualifier |
5 | 5 |
Bundle-ManifestVersion: 2 |
6 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
6 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
7 | 7 |
Eclipse-PlatformFilter: (osgi.os=win32) |
8 | 8 |
Bundle-Vendor: Textometrie.org |
9 | 9 |
Fragment-Host: org.txm.libs.cqp |
10 | 10 |
Automatic-Module-Name: org.txm.libs.cqp.win32 |
11 |
|
|
11 |
Eclipse-BundleShape: dir |
|
12 | 12 |
TXM/trunk/org.txm.statsengine.r.feature/build.properties (revision 3628) | ||
---|---|---|
1 | 1 |
#Fri Jul 06 10:25:17 CEST 2018 |
2 |
bin.includes=feature.xml |
|
2 |
bin.includes=feature.xml, build.properties |
TXM/trunk/org.txm.statsengine.r.feature/feature.xml (revision 3628) | ||
---|---|---|
5 | 5 |
version="1.0.0.qualifier" |
6 | 6 |
provider-name="Textometrie.org" |
7 | 7 |
license-feature="org.txm.rcp.feature" |
8 |
license-feature-version="0.8.2.qualifier">
|
|
8 |
license-feature-version="0.8.3.qualifier">
|
|
9 | 9 |
|
10 | 10 |
<description url="http://www.example.com/description"> |
11 | 11 |
Statistic engine |
12 | 12 |
</description> |
13 | 13 |
|
14 | 14 |
<copyright url="http://www.example.com/copyright"> |
15 |
TXM 0.8.2
|
|
16 |
Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
|
|
15 |
TXM 0.8.3
|
|
16 |
Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
|
|
17 | 17 |
Copyright © 2010-2013 ENS de Lyon. |
18 | 18 |
Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of |
19 | 19 |
Lyon 2, University of Franche-Comté, University of Nice |
... | ... | |
41 | 41 |
<import plugin="org.txm.statsengine.core" version="1.0.0" match="greaterOrEqual"/> |
42 | 42 |
<import plugin="org.txm.libs.rserve"/> |
43 | 43 |
<import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/> |
44 |
<import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
|
|
44 |
<import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
|
|
45 | 45 |
</requires> |
46 | 46 |
|
47 | 47 |
<plugin |
48 | 48 |
TXM/trunk/org.txm.groovy.feature/build.properties (revision 3628) | ||
---|---|---|
1 | 1 |
#Fri Jul 06 10:25:10 CEST 2018 |
2 |
bin.includes=feature.xml |
|
2 |
bin.includes=feature.xml, build.properties |
TXM/trunk/org.txm.groovy.feature/feature.xml (revision 3628) | ||
---|---|---|
4 | 4 |
label="Groovy" |
5 | 5 |
version="1.0.0.qualifier" |
6 | 6 |
license-feature="org.txm.rcp.feature" |
7 |
license-feature-version="0.8.2.qualifier">
|
|
7 |
license-feature-version="0.8.3.qualifier">
|
|
8 | 8 |
|
9 | 9 |
<description url="http://www.example.com/description"> |
10 | 10 |
Groovy scripts and macros |
11 | 11 |
</description> |
12 | 12 |
|
13 | 13 |
<copyright url="http://www.example.com/copyright"> |
14 |
TXM 0.8.2
|
|
15 |
Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
|
|
14 |
TXM 0.8.3
|
|
15 |
Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
|
|
16 | 16 |
Copyright © 2010-2013 ENS de Lyon. |
17 | 17 |
Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of |
18 | 18 |
Lyon 2, University of Franche-Comté, University of Nice |
... | ... | |
37 | 37 |
</license> |
38 | 38 |
|
39 | 39 |
<requires> |
40 |
<import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
|
|
40 |
<import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
|
|
41 | 41 |
</requires> |
42 | 42 |
|
43 | 43 |
<plugin |
44 | 44 |
TXM/trunk/org.txm.ahc.core/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
10 | 10 |
xport |
11 | 11 |
Bundle-ActivationPolicy: lazy |
12 | 12 |
Bundle-ManifestVersion: 2 |
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
14 | 14 |
Bundle-Vendor: Textometrie.org |
15 | 15 |
|
16 | 16 |
TXM/trunk/org.txm.lexicaltable.feature/build.properties (revision 3628) | ||
---|---|---|
1 | 1 |
#Fri Jul 06 10:25:11 CEST 2018 |
2 |
bin.includes=feature.xml |
|
2 |
bin.includes=feature.xml, build.properties |
TXM/trunk/org.txm.lexicaltable.feature/feature.xml (revision 3628) | ||
---|---|---|
4 | 4 |
label="LexicalTable" |
5 | 5 |
version="1.0.0.qualifier" |
6 | 6 |
license-feature="org.txm.rcp.feature" |
7 |
license-feature-version="0.8.2.qualifier">
|
|
7 |
license-feature-version="0.8.3.qualifier">
|
|
8 | 8 |
|
9 | 9 |
<description url="http://www.example.com/description"> |
10 | 10 |
Lexical Table |
11 | 11 |
</description> |
12 | 12 |
|
13 | 13 |
<copyright url="http://www.example.com/copyright"> |
14 |
TXM 0.8.2
|
|
15 |
Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
|
|
14 |
TXM 0.8.3
|
|
15 |
Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
|
|
16 | 16 |
Copyright © 2010-2013 ENS de Lyon. |
17 | 17 |
Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of |
18 | 18 |
Lyon 2, University of Franche-Comté, University of Nice |
19 | 19 |
TXM/trunk/org.txm.cql2lsa.rcp/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
5 | 5 |
Bundle-Version: 1.0.0.qualifier |
6 | 6 |
Bundle-Name: %Bundle-Name |
7 | 7 |
Require-Bundle: org.txm.core;bundle-version="0.7.0";visibility:=reexpo |
8 |
rt,org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,org.eclips
|
|
8 |
rt,org.txm.rcp;bundle-version="0.8.3";visibility:=reexport,org.eclips
|
|
9 | 9 |
e.ui;visibility:=reexport,org.eclipse.core.runtime;visibility:=reexpo |
10 | 10 |
rt,org.eclipse.ui.editors;bundle-version="3.8.100";visibility:=reexpo |
11 | 11 |
rt,org.eclipse.core.expressions;bundle-version="3.4.500";visibility:= |
... | ... | |
15 | 15 |
Bundle-ActivationPolicy: lazy |
16 | 16 |
Bundle-ManifestVersion: 2 |
17 | 17 |
Bundle-Activator: cql2lsarcp.Activator |
18 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
18 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
19 | 19 |
Bundle-Vendor: Textometrie.org |
20 | 20 |
Automatic-Module-Name: org.txm.cql2lsa.rcp |
21 | 21 |
|
22 | 22 |
TXM/trunk/org.txm.edition.feature/build.properties (revision 3628) | ||
---|---|---|
1 | 1 |
#Fri Jul 06 10:25:09 CEST 2018 |
2 |
bin.includes=feature.xml |
|
2 |
bin.includes=feature.xml, build.properties |
TXM/trunk/org.txm.edition.feature/feature.xml (revision 3628) | ||
---|---|---|
5 | 5 |
version="1.0.0.qualifier" |
6 | 6 |
provider-name="Textometrie.org" |
7 | 7 |
license-feature="org.txm.rcp.feature" |
8 |
license-feature-version="0.8.2.qualifier">
|
|
8 |
license-feature-version="0.8.3.qualifier">
|
|
9 | 9 |
|
10 | 10 |
<description url="http://www.example.com/description"> |
11 | 11 |
Edition editor for multi-edition corpora |
12 | 12 |
</description> |
13 | 13 |
|
14 | 14 |
<copyright url="http://www.example.com/copyright"> |
15 |
TXM 0.8.2
|
|
15 |
TXM 0.8.3
|
|
16 | 16 |
Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté. |
17 | 17 |
Copyright © 2010-2013 ENS de Lyon. |
18 | 18 |
Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of |
19 | 19 |
TXM/trunk/org.txm.perl.core/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
5 | 5 |
Bundle-Version: 1.0.0.qualifier |
6 | 6 |
Bundle-Vendor: textometrie.org |
7 | 7 |
Automatic-Module-Name: org.txm.perl.core |
8 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
9 |
Require-Bundle: org.txm.core;bundle-version="0.8.2";visibility:=reexport
|
|
8 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
9 |
Require-Bundle: org.txm.core;bundle-version="0.8.3";visibility:=reexport
|
|
10 | 10 |
Export-Package: org.txm.perl.core |
11 | 11 |
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/LexiconAdapterFactory.java (revision 3628) | ||
---|---|---|
2 | 2 |
package org.txm.index.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.index.core.functions.Lexicon; |
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/PartitionIndexAdapterFactory.java (revision 3628) | ||
---|---|---|
22 | 22 |
"platform:/plugin/" + FrameworkUtil.getBundle(PartitionIndexAdapterFactory.class).getSymbolicName() + "/icons/partitionindex.png"); //$NON-NLS-1$ //$NON-NLS-2$ |
23 | 23 |
|
24 | 24 |
@Override |
25 |
public Object getAdapter(Object adaptableObject, Class adapterType) {
|
|
25 |
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
|
|
26 | 26 |
if (this.canAdapt(adapterType) && adaptableObject instanceof PartitionIndex) { |
27 |
return new TXMResultAdapter() { |
|
27 |
return adapterType.cast(new TXMResultAdapter() {
|
|
28 | 28 |
|
29 | 29 |
@Override |
30 | 30 |
public ImageDescriptor getImageDescriptor(Object object) { |
31 | 31 |
return ICON; |
32 | 32 |
} |
33 |
}; |
|
33 |
});
|
|
34 | 34 |
} |
35 | 35 |
return null; |
36 | 36 |
} |
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/IndexAdapterFactory.java (revision 3628) | ||
---|---|---|
2 | 2 |
package org.txm.index.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.index.core.functions.Index; |
9 | 8 |
import org.txm.rcp.adapters.TXMResultAdapter; |
10 | 9 |
import org.txm.rcp.adapters.TXMResultAdapterFactory; |
11 |
import org.txm.searchengine.cqp.corpus.CQPLexicon; |
|
12 | 10 |
|
13 | 11 |
|
14 | 12 |
/** |
... | ... | |
24 | 22 |
"platform:/plugin/" + FrameworkUtil.getBundle(IndexAdapterFactory.class).getSymbolicName() + "/icons/index.png"); //$NON-NLS-1$ //$NON-NLS-2$ |
25 | 23 |
|
26 | 24 |
@Override |
27 |
public Object getAdapter(Object adaptableObject, Class adapterType) {
|
|
25 |
public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
|
|
28 | 26 |
if (this.canAdapt(adapterType) && adaptableObject instanceof Index) { |
29 |
return new TXMResultAdapter() { |
|
27 |
return adapterType.cast(new TXMResultAdapter() {
|
|
30 | 28 |
|
31 | 29 |
@Override |
32 | 30 |
public ImageDescriptor getImageDescriptor(Object object) { |
33 |
// TODO Auto-generated method stub |
|
34 | 31 |
return ICON; |
35 | 32 |
} |
36 |
}; |
|
33 |
});
|
|
37 | 34 |
} |
38 | 35 |
return null; |
39 | 36 |
} |
37 |
|
|
40 | 38 |
|
41 |
|
|
42 | 39 |
} |
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java (revision 3628) | ||
---|---|---|
28 | 28 |
package org.txm.index.rcp.editors; |
29 | 29 |
|
30 | 30 |
import java.util.ArrayList; |
31 |
import java.util.HashSet; |
|
31 | 32 |
import java.util.List; |
32 | 33 |
|
34 |
import org.eclipse.jface.viewers.StructuredSelection; |
|
33 | 35 |
import org.eclipse.jface.viewers.TableViewer; |
34 | 36 |
import org.eclipse.osgi.util.NLS; |
35 | 37 |
import org.eclipse.swt.SWT; |
... | ... | |
354 | 356 |
|
355 | 357 |
@Override |
356 | 358 |
public void widgetSelected(SelectionEvent e) { |
359 |
|
|
360 |
List<Line> sel = viewer.getStructuredSelection().toList(); |
|
361 |
HashSet<String> lineNames = new HashSet<String>(); |
|
362 |
for (Line l : sel) { |
|
363 |
lineNames.add(l.getSignature()); |
|
364 |
} |
|
365 |
|
|
357 | 366 |
StatusLine.setMessage(TXMUIMessages.sortingColumn); |
358 | 367 |
if (viewer.getTable().getSortColumn() != unitColumn) { |
359 | 368 |
viewer.getTable().setSortColumn(unitColumn); |
... | ... | |
373 | 382 |
|
374 | 383 |
StatusLine.setMessage(TXMUIMessages.sortDone); |
375 | 384 |
fillResultArea(); |
385 |
|
|
386 |
if (lineNames.size() > 0) { |
|
387 |
List<Line> newLines = (List<Line>) viewer.getInput(); |
|
388 |
List<Line> newSelection = new ArrayList<Line>(); |
|
389 |
for (Line l : newLines) { |
|
390 |
if (lineNames.contains(l.getSignature())) newSelection.add(l); |
|
391 |
if (lineNames.size() == 0) break; |
|
392 |
} |
|
393 |
viewer.setSelection(new StructuredSelection(newSelection)); |
|
394 |
} |
|
376 | 395 |
} |
377 | 396 |
|
378 | 397 |
@Override |
... | ... | |
421 | 440 |
|
422 | 441 |
@Override |
423 | 442 |
public void widgetSelected(SelectionEvent e) { |
443 |
|
|
444 |
List<Line> sel = viewer.getStructuredSelection().toList(); |
|
445 |
HashSet<String> lineNames = new HashSet<String>(); |
|
446 |
for (Line l : sel) { |
|
447 |
lineNames.add(l.getSignature()); |
|
448 |
} |
|
449 |
|
|
424 | 450 |
if (viewer.getTable().getSortColumn() != freqColumn) { |
425 | 451 |
viewer.getTable().setSortColumn(freqColumn); |
426 | 452 |
viewer.getTable().setSortDirection(SWT.UP); |
... | ... | |
438 | 464 |
} |
439 | 465 |
StatusLine.setMessage(TXMUIMessages.sortDone); |
440 | 466 |
fillResultArea(); |
467 |
|
|
468 |
if (lineNames.size() > 0) { |
|
469 |
List<Line> newLines = (List<Line>) viewer.getInput(); |
|
470 |
List<Line> newSelection = new ArrayList<Line>(); |
|
471 |
for (Line l : newLines) { |
|
472 |
if (lineNames.contains(l.getSignature())) newSelection.add(l); |
|
473 |
if (lineNames.size() == 0) break; |
|
474 |
} |
|
475 |
viewer.setSelection(new StructuredSelection(newSelection)); |
|
476 |
} |
|
441 | 477 |
} |
442 | 478 |
|
443 | 479 |
@Override |
TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java (revision 3628) | ||
---|---|---|
28 | 28 |
package org.txm.index.rcp.editors; |
29 | 29 |
|
30 | 30 |
import java.util.ArrayList; |
31 |
import java.util.HashSet; |
|
31 | 32 |
import java.util.List; |
32 | 33 |
|
34 |
import org.eclipse.jface.viewers.StructuredSelection; |
|
33 | 35 |
import org.eclipse.jface.viewers.TableViewer; |
34 | 36 |
import org.eclipse.osgi.util.NLS; |
35 | 37 |
import org.eclipse.swt.SWT; |
... | ... | |
80 | 82 |
* @author mdecorde |
81 | 83 |
*/ |
82 | 84 |
public class IndexEditor extends TXMEditor<Index> { |
83 |
|
|
85 |
|
|
84 | 86 |
/** The index. */ |
85 | 87 |
protected Index index; |
86 |
|
|
88 |
|
|
87 | 89 |
// params |
88 | 90 |
/** The query label. */ |
89 | 91 |
protected Label queryLabel; |
90 |
|
|
92 |
|
|
91 | 93 |
// infos |
92 | 94 |
/** The navigation area. */ |
93 | 95 |
protected NavigationWidget navigationArea; |
94 |
|
|
96 |
|
|
95 | 97 |
/** The l fmin info. */ |
96 | 98 |
protected Label lFminInfo; |
97 |
|
|
99 |
|
|
98 | 100 |
/** The line table viewer. */ |
99 | 101 |
protected TableViewer viewer; |
100 |
|
|
102 |
|
|
101 | 103 |
/** The n column. */ |
102 | 104 |
protected TableColumn nColumn; |
103 |
|
|
105 |
|
|
104 | 106 |
/** The unit column. */ |
105 | 107 |
protected TableColumn unitColumn; |
106 |
|
|
108 |
|
|
107 | 109 |
/** The freq column. */ |
108 | 110 |
protected TableColumn freqColumn; |
109 |
|
|
111 |
|
|
110 | 112 |
/** The separator column. */ |
111 | 113 |
protected TableColumn separatorColumn; |
112 |
|
|
113 |
|
|
114 |
|
|
115 |
|
|
114 | 116 |
/** The title. */ |
115 | 117 |
String title; |
116 |
|
|
118 |
|
|
117 | 119 |
/** The query widget. */ |
118 | 120 |
@Parameter(key = TXMPreferences.QUERY) |
119 | 121 |
protected AssistedChoiceQueryWidget queryWidget; |
120 |
|
|
122 |
|
|
121 | 123 |
/** |
122 | 124 |
* Minimum frequency filtering spinner. |
123 | 125 |
*/ |
124 | 126 |
@Parameter(key = TXMPreferences.F_MIN) |
125 | 127 |
protected Spinner fMinSpinner; |
126 |
|
|
128 |
|
|
127 | 129 |
/** |
128 | 130 |
* Maximum frequency filtering spinner. |
129 | 131 |
*/ |
130 | 132 |
@Parameter(key = TXMPreferences.F_MAX) |
131 | 133 |
protected Spinner fMaxSpinner; |
132 |
|
|
134 |
|
|
133 | 135 |
/** |
134 | 136 |
* Maximum number of lines filtering. |
135 | 137 |
*/ |
136 | 138 |
@Parameter(key = TXMPreferences.V_MAX) |
137 | 139 |
protected Spinner vMaxSpinner; |
138 |
|
|
139 |
|
|
140 |
|
|
141 |
|
|
140 | 142 |
/** The N ligne p page spinner. */ |
141 | 143 |
@Parameter(key = TXMPreferences.N_LINES_PER_PAGE) |
142 | 144 |
protected Spinner nLinesPerPageSpinner; |
143 |
|
|
145 |
|
|
144 | 146 |
/** |
145 | 147 |
* Word properties selector. |
146 | 148 |
*/ |
147 | 149 |
@Parameter(key = TXMPreferences.UNIT_PROPERTIES) |
148 | 150 |
protected PropertiesSelector<WordProperty> propertiesSelector; |
149 |
|
|
151 |
|
|
150 | 152 |
/** |
151 | 153 |
* Creates the part control. |
152 | 154 |
* |
... | ... | |
156 | 158 |
*/ |
157 | 159 |
@Override |
158 | 160 |
public void _createPartControl() throws CqiClientException { |
159 |
|
|
160 |
|
|
161 |
|
|
162 |
|
|
161 | 163 |
this.index = this.getResult(); |
162 |
|
|
164 |
|
|
163 | 165 |
// Computing listeners |
164 | 166 |
ComputeSelectionListener computeSelectionListener = new ComputeSelectionListener(this); |
165 | 167 |
ComputeKeyListener computeKeyListener = new ComputeKeyListener(this); |
166 |
|
|
168 |
|
|
167 | 169 |
Composite extendedParametersComposite = this.getExtendedParametersGroup(); |
168 | 170 |
// extendedParametersComposite.setLayout(new FormLayout()); |
169 |
|
|
171 |
|
|
170 | 172 |
// info&navigation panel |
171 | 173 |
final GLComposite infosArea = this.getBottomToolbar().installGLComposite(IndexUIMessages.infos, 1, false); |
172 | 174 |
infosArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false)); |
173 | 175 |
infosArea.getLayout().numColumns = 5; // nav panel + labels |
174 |
|
|
176 |
|
|
175 | 177 |
// on créé une Query, ici le pivot de la concordance est "[]" |
176 | 178 |
// Query Area: query itself + view properties |
177 | 179 |
// Composite queryArea = new Composite(extendedParametersComposite, SWT.NONE); |
... | ... | |
183 | 185 |
// queryArea.setLayoutData(queryLayoutData); |
184 | 186 |
// |
185 | 187 |
// queryArea.setLayout(new GridLayout(4, false)); |
186 |
|
|
188 |
|
|
187 | 189 |
// | Query: [ (v)] [Search] | |
188 |
|
|
189 |
|
|
190 |
|
|
191 |
|
|
190 | 192 |
// Main parameters |
191 | 193 |
// Query |
192 | 194 |
this.getMainParametersComposite().getLayout().numColumns = 3; |
193 | 195 |
// make the zone expandable to display the longest query field |
194 | 196 |
this.getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false)); |
195 |
|
|
197 |
|
|
196 | 198 |
// Query: |
197 | 199 |
queryLabel = new Label(this.getMainParametersComposite(), SWT.NONE); |
198 | 200 |
queryLabel.setText(TXMCoreMessages.common_query); |
199 | 201 |
queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true)); |
200 |
|
|
202 |
|
|
201 | 203 |
// [ (v)] |
202 | 204 |
queryWidget = new AssistedChoiceQueryWidget(this.getMainParametersComposite(), SWT.DROP_DOWN, index.getCorpus()); |
203 | 205 |
GridData layoutData = new GridData(GridData.VERTICAL_ALIGN_CENTER); |
... | ... | |
206 | 208 |
queryWidget.setLayoutData(layoutData); |
207 | 209 |
queryWidget.addKeyListener(computeKeyListener); |
208 | 210 |
queryWidget.getQueryWidget().addModifyListener(computeKeyListener); |
209 |
|
|
211 |
|
|
210 | 212 |
// Word properties selector |
211 | 213 |
propertiesSelector = new PropertiesSelector<>(this.getMainParametersComposite(), SWT.NONE); |
212 | 214 |
propertiesSelector.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false)); |
... | ... | |
221 | 223 |
} |
222 | 224 |
// Listener |
223 | 225 |
propertiesSelector.addSelectionListener(computeSelectionListener); |
224 |
|
|
225 |
|
|
226 |
|
|
227 |
|
|
226 | 228 |
// Extended parameters |
227 |
|
|
229 |
|
|
228 | 230 |
// Filters |
229 | 231 |
//CustomThresholdsGroup thresholdsGroup = new CustomThresholdsGroup(this.getExtendedParametersGroup(), this, new CustomThresholdsGroup.Configuration("F", 0, 100, 0, true, true), new CustomThresholdsGroup.Configuration("V", 0, 100, 0, false, true)); |
230 | 232 |
ThresholdsGroup thresholdsGroup = new ThresholdsGroup(this.getExtendedParametersGroup(), this, true); |
231 |
|
|
233 |
|
|
232 | 234 |
this.fMinSpinner = thresholdsGroup.getFMinSpinner(); |
233 | 235 |
this.fMaxSpinner = thresholdsGroup.getFMaxSpinner(); |
234 | 236 |
this.vMaxSpinner = thresholdsGroup.getVMaxSpinner(); |
235 |
|
|
237 |
|
|
236 | 238 |
CQPCorpus corpus = getResult().getFirstParent(MainCorpus.class); |
237 | 239 |
if (corpus != null) { |
238 | 240 |
this.vMaxSpinner.setMaximum(corpus.getSize()); |
239 | 241 |
this.fMaxSpinner.setMaximum(corpus.getSize()); |
240 | 242 |
this.fMinSpinner.setMaximum(corpus.getSize()); |
241 | 243 |
} |
242 |
|
|
244 |
|
|
243 | 245 |
// FIXME: SJ: we should create a widget class for the number of results per page |
244 | 246 |
// Number of results per page |
245 | 247 |
LabeledSpinner numberOfResultsPerPage = new LabeledSpinner(this.getExtendedParametersGroup(), this, IndexUIMessages.pageSize); |
... | ... | |
248 | 250 |
this.nLinesPerPageSpinner.setMaximum(99999); |
249 | 251 |
this.nLinesPerPageSpinner.setIncrement(1); |
250 | 252 |
this.nLinesPerPageSpinner.setPageIncrement(100); |
251 |
|
|
252 |
|
|
253 |
|
|
253 |
|
|
254 |
|
|
255 |
|
|
254 | 256 |
// Bottom tool bar |
255 | 257 |
navigationArea = new NavigationWidget(infosArea, SWT.NONE); |
256 | 258 |
navigationArea.setLayoutData(new GridData(SWT.CENTER, SWT.FILL, true, false)); |
257 |
|
|
259 |
|
|
258 | 260 |
navigationArea.addFirstListener(new SelectionListener() { |
259 |
|
|
261 |
|
|
260 | 262 |
@Override |
261 | 263 |
public void widgetDefaultSelected(SelectionEvent e) {} |
262 |
|
|
264 |
|
|
263 | 265 |
@Override |
264 | 266 |
public void widgetSelected(SelectionEvent e) { |
265 | 267 |
index.setTopLine(0); |
... | ... | |
270 | 272 |
} |
271 | 273 |
}); |
272 | 274 |
navigationArea.addLastListener(new SelectionListener() { |
273 |
|
|
275 |
|
|
274 | 276 |
@Override |
275 | 277 |
public void widgetDefaultSelected(SelectionEvent e) {} |
276 |
|
|
278 |
|
|
277 | 279 |
@Override |
278 | 280 |
public void widgetSelected(SelectionEvent e) { |
279 | 281 |
int i = (index.getV() / nLinesPerPageSpinner.getSelection()); |
280 | 282 |
int top = i * nLinesPerPageSpinner.getSelection(); |
281 |
|
|
283 |
|
|
282 | 284 |
index.setTopLine(top); |
283 | 285 |
fillResultArea(); |
284 |
|
|
286 |
|
|
285 | 287 |
viewer.getTable().select(0); |
286 | 288 |
viewer.getTable().showSelection(); |
287 | 289 |
} |
288 | 290 |
}); |
289 | 291 |
navigationArea.addNextListener(new SelectionListener() { |
290 |
|
|
292 |
|
|
291 | 293 |
@Override |
292 | 294 |
public void widgetDefaultSelected(SelectionEvent e) {} |
293 |
|
|
295 |
|
|
294 | 296 |
@Override |
295 | 297 |
public void widgetSelected(SelectionEvent e) { |
296 | 298 |
index.setTopLine(index.getTopIndex() + index.getNLinesPerPage()); |
... | ... | |
300 | 302 |
} |
301 | 303 |
}); |
302 | 304 |
navigationArea.addPreviousListener(new SelectionListener() { |
303 |
|
|
305 |
|
|
304 | 306 |
@Override |
305 | 307 |
public void widgetDefaultSelected(SelectionEvent e) {} |
306 |
|
|
308 |
|
|
307 | 309 |
@Override |
308 | 310 |
public void widgetSelected(SelectionEvent e) { |
309 | 311 |
int top = index.getTopIndex() - index.getNLinesPerPage(); |
... | ... | |
316 | 318 |
viewer.getTable().showSelection(); |
317 | 319 |
} |
318 | 320 |
}); |
319 |
|
|
320 |
|
|
321 |
|
|
322 |
|
|
321 | 323 |
lFminInfo = new Label(infosArea, SWT.NONE); |
322 | 324 |
lFminInfo.setText(""); //$NON-NLS-1$ |
323 | 325 |
// lFminInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); |
324 |
|
|
325 |
|
|
326 |
|
|
326 |
|
|
327 |
|
|
328 |
|
|
327 | 329 |
// Result area |
328 | 330 |
Composite resultArea = this.getResultArea(); |
329 |
|
|
331 |
|
|
330 | 332 |
viewer = new TableViewer(resultArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL); |
331 |
|
|
333 |
|
|
332 | 334 |
viewer.getTable().setLinesVisible(true); |
333 | 335 |
viewer.getTable().setHeaderVisible(true); |
334 | 336 |
viewer.getTable().addKeyListener(new TableKeyListener(viewer)); |
335 |
|
|
337 |
|
|
336 | 338 |
String fontName = index.getCorpus().getProject().getFont(); |
337 | 339 |
if (fontName != null && fontName.length() > 0) { |
338 | 340 |
Font old = viewer.getTable().getFont(); |
... | ... | |
341 | 343 |
Font font = new Font(Display.getCurrent(), fontName, fD.getHeight(), fD.getStyle()); |
342 | 344 |
viewer.getTable().setFont(font); |
343 | 345 |
} |
344 |
|
|
346 |
|
|
345 | 347 |
viewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH)); |
346 |
|
|
348 |
|
|
347 | 349 |
viewer.setLabelProvider(new LineLabelProvider(viewer.getTable())); |
348 | 350 |
viewer.setContentProvider(new LineContentProvider()); |
349 | 351 |
viewer.setInput(new ArrayList<Property>()); |
350 |
|
|
352 |
|
|
351 | 353 |
nColumn = new TableColumn(viewer.getTable(), SWT.LEFT); |
352 | 354 |
nColumn.setText(" "); //$NON-NLS-1$ |
353 | 355 |
nColumn.pack(); |
354 |
|
|
356 |
|
|
355 | 357 |
unitColumn = new TableColumn(viewer.getTable(), SWT.LEFT); |
356 | 358 |
unitColumn.setText(TXMCoreMessages.common_units); |
357 | 359 |
unitColumn.setToolTipText(TXMCoreMessages.common_units); |
358 | 360 |
unitColumn.setWidth(300); |
359 | 361 |
unitColumn.addSelectionListener(new SelectionListener() { |
360 |
|
|
362 |
|
|
361 | 363 |
@Override |
362 | 364 |
public void widgetSelected(SelectionEvent e) { |
365 |
|
|
366 |
|
|
367 |
List<Line> sel = viewer.getStructuredSelection().toList(); |
|
368 |
HashSet<String> lineNames = new HashSet<String>(); |
|
369 |
for (Line l : sel) { |
|
370 |
lineNames.add(l.getSignature()); |
|
371 |
} |
|
372 |
|
|
363 | 373 |
StatusLine.setMessage(TXMUIMessages.sortingColumn); |
364 | 374 |
if (viewer.getTable().getSortColumn() != unitColumn) { |
365 | 375 |
viewer.getTable().setSortColumn(unitColumn); |
... | ... | |
376 | 386 |
index.sortLines(SortMode.UNITFREQ, false); |
377 | 387 |
} |
378 | 388 |
} |
379 |
|
|
389 |
|
|
380 | 390 |
StatusLine.setMessage(TXMUIMessages.sortDone); |
381 | 391 |
fillResultArea(); |
392 |
|
|
393 |
if (lineNames.size() > 0) { |
|
394 |
List<Line> newLines = (List<Line>) viewer.getInput(); |
|
395 |
List<Line> newSelection = new ArrayList<Line>(); |
|
396 |
for (Line l : newLines) { |
|
397 |
if (lineNames.contains(l.getSignature())) newSelection.add(l); |
|
398 |
if (lineNames.size() == 0) break; |
|
399 |
} |
|
400 |
viewer.setSelection(new StructuredSelection(newSelection)); |
|
401 |
} |
|
382 | 402 |
} |
383 |
|
|
403 |
|
|
384 | 404 |
@Override |
385 | 405 |
public void widgetDefaultSelected(SelectionEvent e) {} |
386 | 406 |
}); |
387 |
|
|
407 |
|
|
388 | 408 |
freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT); |
389 | 409 |
freqColumn.setText(TXMCoreMessages.common_frequency); |
390 | 410 |
freqColumn.setToolTipText(TXMCoreMessages.common_frequency); |
391 | 411 |
freqColumn.setWidth(100); |
392 | 412 |
freqColumn.addSelectionListener(new SelectionListener() { |
393 |
|
|
413 |
|
|
394 | 414 |
@Override |
395 | 415 |
public void widgetSelected(SelectionEvent e) { |
416 |
|
|
417 |
List<Line> sel = viewer.getStructuredSelection().toList(); |
|
418 |
HashSet<String> lineNames = new HashSet<String>(); |
|
419 |
for (Line l : sel) { |
|
420 |
lineNames.add(l.getSignature()); |
|
421 |
} |
|
422 |
|
|
423 |
System.out.println("sellines: "+sel); |
|
396 | 424 |
if (viewer.getTable().getSortColumn() != freqColumn) { |
397 | 425 |
viewer.getTable().setSortColumn(freqColumn); |
398 | 426 |
viewer.getTable().setSortDirection(SWT.UP); |
... | ... | |
410 | 438 |
} |
411 | 439 |
StatusLine.setMessage(TXMUIMessages.sortDone); |
412 | 440 |
fillResultArea(); |
441 |
|
|
442 |
if (lineNames.size() > 0) { |
|
443 |
List<Line> newLines = (List<Line>) viewer.getInput(); |
|
444 |
List<Line> newSelection = new ArrayList<Line>(); |
|
445 |
for (Line l : newLines) { |
|
446 |
if (lineNames.contains(l.getSignature())) newSelection.add(l); |
|
447 |
if (lineNames.size() == 0) break; |
|
448 |
} |
|
449 |
viewer.setSelection(new StructuredSelection(newSelection)); |
|
450 |
} |
|
413 | 451 |
} |
414 |
|
|
452 |
|
|
415 | 453 |
@Override |
416 | 454 |
public void widgetDefaultSelected(SelectionEvent e) {} |
417 | 455 |
}); |
418 |
|
|
456 |
|
|
419 | 457 |
separatorColumn = new TableColumn(viewer.getTable(), SWT.LEFT); |
420 | 458 |
separatorColumn.setText(""); //$NON-NLS-1$ |
421 | 459 |
separatorColumn.pack(); |
422 |
|
|
423 |
|
|
424 |
|
|
460 |
|
|
461 |
|
|
462 |
|
|
425 | 463 |
extendedParametersComposite.pack(); |
426 |
|
|
464 |
|
|
427 | 465 |
// Add double click, "Send to" command |
428 | 466 |
TXMEditor.addDoubleClickCommandListener(viewer.getTable(), 1, "org.txm.concordance.rcp.handlers.ComputeConcordance"); //$NON-NLS-1$ |
429 | 467 |
TXMEditor.addDoubleClickCommandListener(viewer.getTable(), 2, viewer.getTable().getColumnCount() - 1, "org.txm.progression.rcp.handlers.ComputeProgression"); //$NON-NLS-1$ |
430 |
|
|
468 |
|
|
431 | 469 |
// Register the context menu |
432 | 470 |
TXMEditor.initContextMenu(this.viewer.getTable(), this.getSite(), this.viewer); |
433 | 471 |
TXMEditor.packColumns(this.viewer); |
434 | 472 |
setFocus(); |
435 |
|
|
473 |
|
|
436 | 474 |
} |
437 |
|
|
438 |
|
|
439 |
|
|
440 |
|
|
475 |
|
|
476 |
|
|
477 |
|
|
478 |
|
|
441 | 479 |
@Override |
442 | 480 |
public void updateResultFromEditor() { |
443 | 481 |
// nothing to do |
444 | 482 |
} |
445 |
|
|
446 |
|
|
483 |
|
|
484 |
|
|
447 | 485 |
/** |
448 | 486 |
* Computes index. |
449 | 487 |
*/ |
450 | 488 |
@Override |
451 | 489 |
public void updateEditorFromResult(final boolean update) { |
452 |
|
|
490 |
|
|
453 | 491 |
QueriesView.refresh(); |
454 | 492 |
RVariablesView.refresh(); |
455 |
|
|
493 |
|
|
456 | 494 |
if (!queryWidget.isDisposed()) { |
457 | 495 |
queryWidget.memorize(); |
458 | 496 |
} |
459 |
|
|
497 |
|
|
460 | 498 |
fillResultArea(); |
461 |
|
|
499 |
|
|
462 | 500 |
TXMEditor.packColumns(this.viewer); |
463 |
|
|
501 |
|
|
464 | 502 |
viewer.getTable().setFocus(); |
465 | 503 |
} |
466 |
|
|
467 |
|
|
468 |
|
|
504 |
|
|
505 |
|
|
506 |
|
|
469 | 507 |
/** |
470 | 508 |
* Fill result area using the index top and index number of results per page parameters. |
471 | 509 |
* |
... | ... | |
473 | 511 |
public void fillResultArea() { |
474 | 512 |
// System.out.println("call fill from "+from+" to "+to); |
475 | 513 |
int from = index.getTopIndex(); |
476 |
|
|
514 |
|
|
477 | 515 |
int to = from + index.getNLinesPerPage(); |
478 | 516 |
to = Math.min(to, index.getV()); |
479 |
|
|
517 |
|
|
480 | 518 |
List<Line> lines = null; |
481 | 519 |
if (index.getV() > 0) { |
482 | 520 |
lines = index.getLines(from, to); |
... | ... | |
484 | 522 |
else { |
485 | 523 |
lines = new ArrayList<>(); |
486 | 524 |
} |
487 |
|
|
525 |
|
|
488 | 526 |
navigationArea.setInfoLineText(Integer.toString(from + 1), NLS.bind("{0} / {1}", to, index.getV())); //$NON-NLS-1$ |
489 | 527 |
navigationArea.setPreviousEnabled(from > 0); |
490 | 528 |
navigationArea.setFirstEnabled(from > 0); |
491 | 529 |
navigationArea.setNextEnabled(to < index.getV()); |
492 | 530 |
navigationArea.setLastEnabled(to < index.getV()); |
493 |
|
|
531 |
|
|
494 | 532 |
lFminInfo.setText(TXMCoreMessages.bind(IndexUIMessages.tP0vP1fminP2fmaxP3, index.getT(), index.getV(), index.getFmin(), index.getFmax())); |
495 | 533 |
lFminInfo.getParent().layout(); |
496 |
|
|
534 |
|
|
497 | 535 |
String unitColumnHeader = ""; //$NON-NLS-1$ |
498 | 536 |
for (Property p : index.getProperties()) { |
499 | 537 |
unitColumnHeader += p.getName() + index.getPropertySeparator(); |
... | ... | |
502 | 540 |
unitColumnHeader = unitColumnHeader.substring(0, unitColumnHeader.length() - 1); |
503 | 541 |
} |
504 | 542 |
unitColumn.setText(unitColumnHeader); |
505 |
|
|
543 |
|
|
506 | 544 |
viewer.setInput(lines); |
507 | 545 |
if (from == 0) { |
508 | 546 |
viewer.getTable().setTopIndex(0); |
509 | 547 |
} |
510 |
|
|
548 |
|
|
511 | 549 |
// Refresh and pack the columns |
512 | 550 |
TXMEditor.packColumns(viewer); |
513 |
|
|
551 |
|
|
514 | 552 |
} |
515 |
|
|
553 |
|
|
516 | 554 |
/** |
517 | 555 |
* Sets the focus. |
518 | 556 |
* |
... | ... | |
525 | 563 |
} |
526 | 564 |
StatusLine.setMessage(IndexUIMessages.openingTheIndexResults); |
527 | 565 |
} |
528 |
|
|
566 |
|
|
529 | 567 |
/** |
530 | 568 |
* Gets the corpus of the index. |
531 | 569 |
* |
... | ... | |
534 | 572 |
public CQPCorpus getCorpus() { |
535 | 573 |
return index.getCorpus(); |
536 | 574 |
} |
537 |
|
|
575 |
|
|
538 | 576 |
/** |
539 | 577 |
* Gets the query of the query widget. |
540 | 578 |
* |
... | ... | |
548 | 586 |
|
549 | 587 |
|
550 | 588 |
public TableViewer getTableViewer() { |
551 |
|
|
589 |
|
|
552 | 590 |
return viewer; |
553 | 591 |
} |
554 | 592 |
} |
TXM/trunk/org.txm.index.rcp/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
9 | 9 |
org.txm.links.rcp;bundle-version="1.0.0";visibility:=reexport, |
10 | 10 |
org.txm.index.core;bundle-version="1.0.0";visibility:=reexport |
11 | 11 |
Bundle-ManifestVersion: 2 |
12 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
12 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
13 | 13 |
Bundle-Vendor: Textometrie.org |
14 | 14 |
Automatic-Module-Name: org.txm.index.rcp |
15 | 15 |
|
16 | 16 |
TXM/trunk/org.txm.libs.gson/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
4 | 4 |
Bundle-SymbolicName: org.txm.libs.gson |
5 | 5 |
Bundle-Version: 2.8.6 |
6 | 6 |
Automatic-Module-Name: org.txm.libs.gson |
7 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
7 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
8 | 8 |
Bundle-ClassPath: gson-2.8.6.jar, |
9 | 9 |
. |
10 | 10 |
Export-Package: com.google.gson, |
11 | 11 |
TXM/trunk/org.txm.svn.feature/build.properties (revision 3628) | ||
---|---|---|
1 | 1 |
#Fri Jul 06 10:25:18 CEST 2018 |
2 |
bin.includes=feature.xml |
|
2 |
bin.includes=feature.xml, build.properties |
TXM/trunk/org.txm.svn.feature/feature.xml (revision 3628) | ||
---|---|---|
4 | 4 |
label="SVN" |
5 | 5 |
version="1.0.0.qualifier" |
6 | 6 |
license-feature="org.txm.rcp.feature" |
7 |
license-feature-version="0.8.2.qualifier">
|
|
7 |
license-feature-version="0.8.3.qualifier">
|
|
8 | 8 |
|
9 | 9 |
<description url="http://www.example.com/description"> |
10 | 10 |
SVN access |
11 | 11 |
</description> |
12 | 12 |
|
13 | 13 |
<copyright url="http://www.example.com/copyright"> |
14 |
TXM 0.8.2
|
|
15 |
Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
|
|
14 |
TXM 0.8.3
|
|
15 |
Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
|
|
16 | 16 |
Copyright © 2010-2013 ENS de Lyon. |
17 | 17 |
Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of |
18 | 18 |
Lyon 2, University of Franche-Comté, University of Nice |
19 | 19 |
TXM/trunk/org.txm.tokenizer.core/src/org/txm/tokenizer/SimpleStringTokenizer.groovy (revision 3628) | ||
---|---|---|
137 | 137 |
/** |
138 | 138 |
* Process word. |
139 | 139 |
*/ |
140 |
public ArrayList<ArrayList<String>> processText(String text) {
|
|
140 |
public List<List<String>> processText(String text) {
|
|
141 | 141 |
ArrayList<ArrayList<String>> result = new ArrayList<String>() |
142 | 142 |
ArrayList<String> sresult = new ArrayList<String>() |
143 | 143 |
if (regSplitWhiteSpaces != null) { |
... | ... | |
256 | 256 |
["fr", "C'est un autre test."], |
257 | 257 |
[ |
258 | 258 |
"fr", |
259 |
"C'est une version 0.8.2 un 01:12:12 test vers http://un.site.web.fr, fin."
|
|
259 |
"C'est une version 1.2.3 un 01:12:12 test vers http://un.site.web.fr, fin."
|
|
260 | 260 |
], |
261 | 261 |
["en", "This is a test."], |
262 | 262 |
["en", "It's a test."] |
TXM/trunk/org.txm.tokenizer.core/build.properties (revision 3628) | ||
---|---|---|
2 | 2 |
output..=bin/ |
3 | 3 |
bin.includes = META-INF/,\ |
4 | 4 |
.,\ |
5 |
plugin.xml,\ |
|
6 | 5 |
OSGI-INF/ |
7 | 6 |
source..=src/ |
8 | 7 |
#qualifier=svn |
TXM/trunk/org.txm.tokenizer.core/.settings/org.eclipse.jdt.groovy.core.prefs (revision 3628) | ||
---|---|---|
1 | 1 |
eclipse.preferences.version=1 |
2 |
groovy.compiler.level=-1
|
|
2 |
groovy.compiler.level=40
|
|
3 | 3 |
groovy.script.filters=**/*.dsld,y,**/*.gradle,n |
TXM/trunk/org.txm.tokenizer.core/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
8 | 8 |
ity:=reexport,org.txm.utils.core;bundle-version="1.0.0";visibility:=r |
9 | 9 |
eexport,org.eclipse.core.resources;visibility:=reexport |
10 | 10 |
Bundle-ManifestVersion: 2 |
11 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
11 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
12 | 12 |
Bundle-Vendor: Textometrie.org |
13 | 13 |
|
14 | 14 |
TXM/trunk/org.txm.xmleditor.feature/build.properties (revision 3628) | ||
---|---|---|
1 |
bin.includes = feature.xml |
|
1 |
bin.includes = feature.xml, build.properties |
TXM/trunk/org.txm.xmleditor.feature/feature.xml (revision 3628) | ||
---|---|---|
5 | 5 |
version="1.0.0.qualifier" |
6 | 6 |
provider-name="textometrie.org" |
7 | 7 |
license-feature="org.txm.rcp.feature" |
8 |
license-feature-version="0.8.2.qualifier">
|
|
8 |
license-feature-version="0.8.3.qualifier">
|
|
9 | 9 |
|
10 | 10 |
<description url="http://www.example.com/description"> |
11 | 11 |
Add a XML Editor in TXM |
12 | 12 |
</description> |
13 | 13 |
|
14 | 14 |
<copyright url="http://www.example.com/copyright"> |
15 |
TXM 0.8.2
|
|
16 |
Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
|
|
15 |
TXM 0.8.3
|
|
16 |
Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
|
|
17 | 17 |
Copyright © 2010-2013 ENS de Lyon. |
18 | 18 |
Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of |
19 | 19 |
Lyon 2, University of Franche-Comté, University of Nice |
... | ... | |
37 | 37 |
[Enter License Description here.] |
38 | 38 |
</license> |
39 | 39 |
|
40 |
<requires> |
|
41 |
<import plugin="org.eclipse.ui.ide" version="3.12.0" match="compatible"/> |
|
42 |
<import plugin="org.eclipse.ui.views" version="3.8.0" match="compatible"/> |
|
43 |
<import plugin="org.eclipse.jface.text" version="3.10.0" match="compatible"/> |
|
44 |
<import plugin="org.eclipse.ui.workbench.texteditor" version="3.10.0" match="compatible"/> |
|
45 |
<import plugin="org.eclipse.wst.sse.ui" version="1.3.500" match="greaterOrEqual"/> |
|
46 |
<import plugin="org.eclipse.wst.sse.core" version="1.1.900" match="greaterOrEqual"/> |
|
47 |
<import plugin="org.eclipse.ui" version="3.107.0" match="compatible"/> |
|
48 |
<import plugin="org.eclipse.core.resources" version="3.11.0" match="compatible"/> |
|
49 |
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/> |
|
50 |
<import plugin="org.eclipse.wst.common.uriresolver" version="1.3.0" match="greaterOrEqual"/> |
|
51 |
<import plugin="org.eclipse.wst.xml.core" version="1.1.1100" match="greaterOrEqual"/> |
|
52 |
<import plugin="org.eclipse.wst.common.ui" version="1.2.100" match="greaterOrEqual"/> |
|
53 |
<import plugin="org.eclipse.wst.validation" version="1.2.700" match="equivalent"/> |
|
54 |
<import plugin="org.eclipse.wst.validation.ui"/> |
|
55 |
<import plugin="org.eclipse.core.expressions" version="3.5.0" match="compatible"/> |
|
56 |
<import plugin="org.eclipse.core.filesystem" version="1.6.0" match="compatible"/> |
|
57 |
<import plugin="org.txm.rcp" version="0.7.8" match="greaterOrEqual"/> |
|
58 |
<import plugin="org.eclipse.wst.xml.ui" version="1.1.800" match="greaterOrEqual"/> |
|
59 |
<import plugin="org.txm.concordance.rcp" version="1.0.0" match="greaterOrEqual"/> |
|
60 |
<import plugin="org.txm.edition.rcp" version="1.0.0" match="greaterOrEqual"/> |
|
61 |
<import plugin="org.eclipse.search"/> |
|
62 |
</requires> |
|
63 |
|
|
40 | 64 |
<plugin |
41 | 65 |
id="org.txm.xmleditor.rcp" |
42 | 66 |
download-size="0" |
43 | 67 |
TXM/trunk/org.txm.libs.cqp.macosx/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
3 | 3 |
Bundle-Name: org.txm.libs.cqp.macosx |
4 | 4 |
Bundle-Version: 1.1.0.qualifier |
5 | 5 |
Bundle-ManifestVersion: 2 |
6 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
6 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
7 | 7 |
Eclipse-PlatformFilter: (osgi.os=macosx) |
8 | 8 |
Bundle-Vendor: Textometrie.org |
9 | 9 |
Fragment-Host: org.txm.libs.cqp |
10 | 10 |
Automatic-Module-Name: org.txm.libs.cqp.macosx |
11 |
Eclipse-BundleShape: dir |
|
11 | 12 |
|
12 | 13 |
TXM/trunk/org.txm.ca.rcp/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
10 | 10 |
ca.core;bundle-version="1.0.0";visibility:=reexport |
11 | 11 |
Bundle-ActivationPolicy: lazy |
12 | 12 |
Bundle-ManifestVersion: 2 |
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
14 | 14 |
Bundle-Vendor: Textometrie.org |
15 | 15 |
Automatic-Module-Name: org.txm.ca.rcp |
16 | 16 |
|
17 | 17 |
TXM/trunk/org.txm.statsengine.r.rcp/META-INF/MANIFEST.MF (revision 3628) | ||
---|---|---|
6 | 6 |
Bundle-SymbolicName: org.txm.statsengine.r.rcp;singleton:=true |
7 | 7 |
Bundle-Version: 1.0.0.qualifier |
8 | 8 |
Bundle-Name: %Bundle-Name |
9 |
Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexpor
|
|
9 |
Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexpor
|
|
10 | 10 |
t,org.txm.statsengine.r.core;bundle-version="1.0.0";visibility:=reexp |
11 | 11 |
ort |
12 | 12 |
Bundle-ManifestVersion: 2 |
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
|
13 |
Bundle-RequiredExecutionEnvironment: JavaSE-16
|
|
14 | 14 |
Bundle-Vendor: Textometrie.org |
15 | 15 |
Automatic-Module-Name: org.txm.statsengine.r.rcp |
16 | 16 |
|
17 | 17 |
Formats disponibles : Unified diff