Révision 3079

tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationInjector.java (revision 3079)
859 859
	
860 860
	public static void main(String[] args) {
861 861
		try {
862
			File xmlFile = new File(System.getProperty("user.home"), "TXM-0.8.1/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test.xml");
863
			File outfile = new File(System.getProperty("user.home"), "TXM-0.8.1/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test-out.xml");
862
			File xmlFile = new File(System.getProperty("user.home"), "TXM-0.8.2/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test.xml");
863
			File outfile = new File(System.getProperty("user.home"), "TXM-0.8.2/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test-out.xml");
864 864
			
865 865
			ArrayList<Annotation> segmentAnnotations = new ArrayList<>();
866 866
			// int starts[] = { 3, 6 };
tmp/org.txm.specificities.feature/feature.xml (revision 3079)
4 4
      label="Specificities"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description url="http://www.example.com/description">
10 10
      Specificities
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
14
      TXM 0.8.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
tmp/org.txm.core.feature/feature.xml (revision 3079)
4 4
      label="TXM Core"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description>
10 10
      TXM Core (no UI)
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
14
      TXM 0.8.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
......
59 59
      <import plugin="org.txm.libs.msoffice" version="1.0.0" match="greaterOrEqual"/>
60 60
      <import plugin="org.txm.libs.office" version="0.8.2" match="greaterOrEqual"/>
61 61
      <import plugin="com.ibm.icu"/>
62
      <import plugin="org.txm.core" version="0.8.1" match="greaterOrEqual"/>
62
      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
63 63
      <import plugin="javax.xml" version="1.3.4" match="compatible"/>
64 64
      <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/>
65 65
      <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/>
tmp/org.txm.libs.office/build.properties (revision 3079)
4 4
               .,\
5 5
               lib/java-rdfa-0.4.2.jar,\
6 6
               lib/log4j-1.2.17.jar,\
7
               lib/odfdom-java-0.8.11-incubating.jar,\
7
               lib/odfdom-java-0.8.21-incubating.jar,\
8 8
               lib/simple-odf-0.8.2-incubating.jar,\
9 9
               lib/slf4j-api-1.7.25.jar,\
10 10
               lib/commons-beanutils-1.9.2.jar,\
......
18 18
               lib/odfdom-java-0.8.7.jar,\
19 19
               lib/org.odftoolkit.odfdom.converter.core-1.0.6.jar,\
20 20
               lib/slf4j-log4j12-1.7.6.jar,\
21
               lib/taglets-0.8.11-incubating.jar,\
21
               lib/taglets-0.8.21-incubating.jar,\
22 22
               lib/xercesImpl-2.9.1.jar,\
23 23
               lib/xml-apis-1.3.04.jar,\
24 24
               OSGI-INF/
tmp/org.txm.treetagger.feature/feature.xml (revision 3079)
68 68
   </license>
69 69

  
70 70
   <requires>
71
      <import plugin="org.txm.core" version="0.8.1" match="greaterOrEqual"/>
71
      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
72 72
      <import plugin="org.txm.treetagger.core" version="1.0.0" match="greaterOrEqual"/>
73
      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
73
      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
74 74
      <import plugin="org.txm.index.rcp" version="1.0.0" match="greaterOrEqual"/>
75 75
   </requires>
76 76

  
tmp/org.txm.edition.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.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.1
15
      TXM 0.8.2
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
tmp/org.txm.wordcloud.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.qualifier">
9 9

  
10 10
   <description url="http://www.example.com/description">
11 11
      Additional WordCloud command to build a visual representation of a hierarchical index or lexicon as a cloud of words.
12 12
   </description>
13 13

  
14 14
   <copyright url="http://www.example.com/copyright">
15
      TXM 0.8.1
15
      TXM 0.8.2
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
tmp/org.txm.chartsengine.r.feature/feature.xml (revision 3079)
4 4
      label="R Charts Engine"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description url="http://www.example.com/description">
10 10
      R chart engine for TXM
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
14
      TXM 0.8.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
......
41 41
      <import plugin="org.txm.chartsengine.core" version="1.0.0" match="greaterOrEqual"/>
42 42
      <import plugin="org.txm.chartsengine.rcp" version="1.0.0" match="greaterOrEqual"/>
43 43
      <import plugin="org.txm.chartsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
44
      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
44
      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
45 45
   </requires>
46 46

  
47 47
   <plugin
tmp/org.txm.groovy.core/src/groovy/org/txm/macro/commands/NIndexMacro.groovy (revision 3079)
98 98
	try {
99 99
		 Class.forName( "org.odftoolkit.simple.SpreadsheetDocument")
100 100
	} catch(e) {
101
		 println "** $scriptName: the simple-odf-0.8.1-incubating.jar file is needed in the \$HOME/TXM/scripts/lib directory to write in ODS format. Please uncheck the odsOutputFormat option. Aborting."
101
		 println "** $scriptName: the simple-odf-0.8.2-incubating.jar file is needed in the \$HOME/TXM/scripts/lib directory to write in ODS format. Please uncheck the odsOutputFormat option. Aborting."
102 102
		return false
103 103
	}
104 104

  
tmp/org.txm.groovy.core/src/groovy/org/txm/macro/edition/ImportAlignedEditionMacro.groovy (revision 3079)
116 116
	dest_edition = new Edition(dest_text)
117 117
	dest_edition.setName(destination_edition_name)
118 118
	dest_edition.saveParameter("corpus", destination_corpus.getID())
119
	dest_edition.pPageNames = src_edition.pPageNames // replace with getter&setter when published in TXM 0.8.1
119
	dest_edition.pPageNames = src_edition.pPageNames // replace with getter&setter when published in TXM 0.8.2
120 120
	dest_edition.pPageFirstWordIds = src_edition.pPageFirstWordIds
121 121
	dest_edition.compute(false)
122 122
	
tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/CmdLineParser.java (revision 3079)
63 63
	/**
64 64
	 * Discovered {@link OptionHandler}s for options.
65 65
	 */
66
	private final List<OptionHandler> options = new ArrayList<OptionHandler>();
66
	private final List<OptionHandler> options = new ArrayList<>();
67 67
	
68 68
	/**
69 69
	 * Discovered {@link OptionHandler}s for arguments.
70 70
	 */
71
	private final List<OptionHandler> arguments = new ArrayList<OptionHandler>();
71
	private final List<OptionHandler> arguments = new ArrayList<>();
72 72
	
73 73
	private boolean parsingOptions = true;
74 74
	
......
180 180
			// infer the type
181 181
			
182 182
			// enum is the special case
183
			Class t = setter.getType();
183
			Class<?> t = setter.getType();
184 184
			if (Enum.class.isAssignableFrom(t))
185 185
				return new EnumOptionHandler(this, o, setter, t);
186 186
			
......
247 247
	 *
248 248
	 *         <pre>
249 249
	 *         System.err.println("java -jar my.jar" + parser.printExample(REQUIRED) + " arg1 arg2");
250
	 * 		</pre>
250
	 *         </pre>
251 251
	 */
252 252
	public String printExample(ExampleMode mode, ResourceBundle rb) {
253 253
		StringBuilder buf = new StringBuilder();
......
353 353
	 * @return list of all wrapped parts
354 354
	 */
355 355
	private List<String> wrapLines(String line, final int maxLength) {
356
		List<String> rv = new ArrayList<String>();
356
		List<String> rv = new ArrayList<>();
357 357
		for (String restOfLine : line.split("\\n")) {
358 358
			while (restOfLine.length() > maxLength) {
359 359
				// try to wrap at space, but don't try too hard as some languages don't even have whitespaces.
......
404 404
			pos += n;
405 405
		}
406 406
		
407
		@Override
407 408
		public String getParameter(int idx) throws CmdLineException {
408 409
			if (pos + idx >= args.length)
409 410
				throw new CmdLineException(CmdLineParser.this, Messages.MISSING_OPERAND.format(getOptionName()));
410 411
			return args[pos + idx];
411 412
		}
412 413
		
414
		@Override
413 415
		public int size() {
414 416
			return args.length - pos;
415 417
		}
......
439 441
	public void parseArgument(final String... args) throws CmdLineException {
440 442
		CmdLineImpl cmdLine = new CmdLineImpl(args);
441 443
		
442
		Set<OptionHandler> present = new HashSet<OptionHandler>();
444
		Set<OptionHandler> present = new HashSet<>();
443 445
		int argIndex = 0;
444 446
		
445 447
		while (cmdLine.hasMore()) {
......
522 524
	
523 525
	
524 526
	private Map<String, OptionHandler> filter(List<OptionHandler> opt, String keyFilter) {
525
		Map<String, OptionHandler> rv = new TreeMap<String, OptionHandler>();
527
		Map<String, OptionHandler> rv = new TreeMap<>();
526 528
		for (OptionHandler h : opt) {
527 529
			if (opt.toString().startsWith(keyFilter)) rv.put(opt.toString(), h);
528 530
		}
......
544 546
	 *
545 547
	 * Constructors of {@link OptionHandler}-derived class keyed by their supported types.
546 548
	 */
547
	private static final Map<Class, Constructor<? extends OptionHandler>> handlerClasses = Collections.synchronizedMap(new HashMap<Class, Constructor<? extends OptionHandler>>());
549
	private static final Map<Class<?>, Constructor<? extends OptionHandler>> handlerClasses = Collections.synchronizedMap(new HashMap<Class<?>, Constructor<? extends OptionHandler>>());
548 550
	
549 551
	/**
550 552
	 * Registers a user-defined {@link OptionHandler} class with args4j.
tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/FieldParser.java (revision 3079)
15 15
public class FieldParser {
16 16
	
17 17
	public void parse(CmdLineParser parser, Object bean) throws ClassNotFoundException {
18
		for (Class c = bean.getClass(); c != null; c = c.getSuperclass()) {
18
		for (Class<?> c = bean.getClass(); c != null; c = c.getSuperclass()) {
19 19
			System.out.println("Class: " + c); //$NON-NLS-1$
20 20
			for (Field f : c.getDeclaredFields()) {
21 21
				Option o = new OptionImpl(createConfigElement(f));
tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/MapSetter.java (revision 3079)
13 13
 * <tt>-map key=value</tt>
14 14
 * </p>
15 15
 */
16
@SuppressWarnings("rawtypes")
16 17
public class MapSetter implements Setter {
17 18
	
18 19
	private final Field f;
......
26 27
		this.bean = bean;
27 28
	}
28 29
	
30
	@Override
29 31
	public Class getType() {
30 32
		return f.getType();
31 33
	}
32 34
	
35
	@Override
33 36
	public boolean isMultiValued() {
34 37
		return false;
35 38
	}
36 39
	
40
	@Override
37 41
	public void addValue(Object value) {
38 42
		if (String.valueOf(value).indexOf('=') == -1) {
39 43
			throw new RuntimeException(Messages.FORMAT_ERROR_FOR_MAP.format());
tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/MethodSetter.java (revision 3079)
11 11
 *
12 12
 * @author Kohsuke Kawaguchi
13 13
 */
14
@SuppressWarnings("rawtypes")
14 15
public final class MethodSetter implements Setter {
15 16
	
16 17
	private final CmdLineParser parser;
......
27 28
			throw new IllegalAnnotationError(Messages.ILLEGAL_METHOD_SIGNATURE.format(m));
28 29
	}
29 30
	
31
	@Override
30 32
	public Class getType() {
31 33
		return m.getParameterTypes()[0];
32 34
	}
33 35
	
36
	@Override
34 37
	public boolean isMultiValued() {
35 38
		return false;
36 39
	}
37 40
	
41
	@Override
38 42
	public void addValue(Object value) throws CmdLineException {
39 43
		try {
40 44
			try {
tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/FieldSetter.java (revision 3079)
9 9
 *
10 10
 * @author Kohsuke Kawaguchi
11 11
 */
12
@SuppressWarnings("rawtypes")
12 13
final class FieldSetter implements Setter {
13 14
	
14 15
	private final Field f;
......
20 21
		this.f = f;
21 22
	}
22 23
	
24
	@Override
23 25
	public Class getType() {
24 26
		return f.getType();
25 27
	}
26 28
	
29
	@Override
27 30
	public boolean isMultiValued() {
28 31
		return false;
29 32
	}
30 33
	
34
	@Override
31 35
	public void addValue(Object value) {
32 36
		try {
33 37
			f.set(bean, value);
tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/MultiValueFieldSetter.java (revision 3079)
14 14
 *
15 15
 * @author Kohsuke Kawaguchi
16 16
 */
17
@SuppressWarnings("rawtypes")
17 18
final class MultiValueFieldSetter implements Setter {
18 19
	
19 20
	private final Object bean;
......
28 29
			throw new IllegalAnnotationError(Messages.ILLEGAL_FIELD_SIGNATURE.format(f.getType()));
29 30
	}
30 31
	
32
	@Override
31 33
	public boolean isMultiValued() {
32 34
		return true;
33 35
	}
34 36
	
37
	@Override
35 38
	public Class getType() {
36 39
		// TODO: compute this correctly
37 40
		Type t = f.getGenericType();
......
44 47
		return Object.class;
45 48
	}
46 49
	
50
	@Override
47 51
	public void addValue(Object value) {
48 52
		try {
49 53
			doAddValue(bean, value);
......
63 67
	private void doAddValue(Object bean, Object value) throws IllegalAccessException {
64 68
		Object o = f.get(bean);
65 69
		if (o == null) {
66
			o = new ArrayList<Object>();
70
			o = new ArrayList<>();
67 71
			f.set(bean, o);
68 72
		}
69 73
		if (!(o instanceof List))
tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/ClassParser.java (revision 3079)
17 17
	
18 18
	public void parse(Object bean, CmdLineParser parser) {
19 19
		// recursively process all the methods/fields.
20
		for (Class c = bean.getClass(); c != null; c = c.getSuperclass()) {
20
		for (Class<?> c = bean.getClass(); c != null; c = c.getSuperclass()) {
21 21
			for (Method m : c.getDeclaredMethods()) {
22 22
				Option o = m.getAnnotation(Option.class);
23 23
				if (o != null) {
tmp/org.txm.lexicaltable.feature/feature.xml (revision 3079)
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.1.qualifier">
7
      license-feature-version="0.8.2.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.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
tmp/org.txm.ahc.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.qualifier">
9 9

  
10 10
   <description url="http://www.example.com/description">
11 11
      AHC command plugins
12 12
   </description>
13 13

  
14 14
   <copyright url="http://www.example.com/copyright">
15
      TXM 0.8.1
15
      TXM 0.8.2
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
tmp/org.txm.properties.feature/feature.xml (revision 3079)
4 4
      label="Properties"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description url="http://www.example.com/description">
10 10
      Corpus Properties
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
14
      TXM 0.8.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
......
38 38

  
39 39
   <requires>
40 40
      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
41
      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
41
      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
42 42
      <import plugin="org.txm.properties.core" version="1.0.0" match="greaterOrEqual"/>
43 43
   </requires>
44 44

  
tmp/org.txm.index.feature/feature.xml (revision 3079)
4 4
      label="Index"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description url="http://www.example.com/description">
10 10
      Index
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
14
      TXM 0.8.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
tmp/org.txm.progression.feature/feature.xml (revision 3079)
4 4
      label="Progression"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description url="http://www.example.com/description">
10 10
      Progression
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
14
      TXM 0.8.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
tmp/org.txm.concordance.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.qualifier">
9 9

  
10 10
   <description url="http://www.example.com/description">
11 11
      Concordances
12 12
   </description>
13 13

  
14 14
   <copyright url="http://www.example.com/copyright">
15
      TXM 0.8.1
15
      TXM 0.8.2
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
......
40 40
   <requires>
41 41
      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
42 42
      <import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
43
      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
43
      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
44 44
      <import plugin="org.txm.concordance.core" version="1.0.0" match="greaterOrEqual"/>
45 45
   </requires>
46 46

  
tmp/org.txm.analec.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.qualifier">
9 9

  
10 10
   <description url="http://www.example.com/description">
11 11
      Annotate through TXM editions using URS Annotation structures (Unit-Relation-Schema).
12 12
   </description>
13 13

  
14 14
   <copyright url="http://www.example.com/copyright">
15
      TXM 0.8.1
15
      TXM 0.8.2
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
......
41 41
      <import plugin="org.eclipse.jface"/>
42 42
      <import plugin="org.eclipse.swt"/>
43 43
      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
44
      <import plugin="org.txm.core" version="0.8.1" match="greaterOrEqual"/>
45
      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
44
      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
45
      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
46 46
      <import plugin="org.txm.utils.core"/>
47 47
      <import feature="org.txm.edition.feature" version="1.0.0.qualifier"/>
48 48
      <import feature="org.txm.lexicaltable.feature" version="1.0.0.qualifier"/>
tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java (revision 3079)
30 30
	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
31 31
	 */
32 32
	@Override
33
	public Object getAdapter(Object adaptableObject, Class adapterType) {
33
	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
34 34
		if (this.canAdapt(adapterType) && adaptableObject instanceof AHC) {
35
			return new TXMResultAdapter() {
35
			return adapterType.cast(new TXMResultAdapter() {
36 36
				
37 37
				@Override
38 38
				public ImageDescriptor getImageDescriptor(Object object) {
39 39
					return ICON;
40 40
				}
41
			};
41
			});
42 42
		}
43 43
		return null;
44 44
	}
tmp/org.txm.annotation.kr.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.qualifier">
9 9

  
10 10
   <description url="http://www.example.com/description">
11 11
      Typed+value annotation through concordances
12 12
   </description>
13 13

  
14 14
   <copyright url="http://www.example.com/copyright">
15
      TXM 0.8.1
15
      TXM 0.8.2
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
tmp/org.txm.chartsengine.jfreechart.feature/feature.xml (revision 3079)
4 4
      label="JFreeChart"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description url="http://www.example.com/description">
10 10
      JFreeChart chart engine for TXM
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
14
      TXM 0.8.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
......
43 43
      <import plugin="org.txm.libs.jfreesvg" version="1.7.0" match="greaterOrEqual"/>
44 44
      <import plugin="org.txm.chartsengine.rcp" version="1.0.0" match="greaterOrEqual"/>
45 45
      <import plugin="org.txm.chartsengine.jfreechart.core" version="1.0.0" match="greaterOrEqual"/>
46
      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
46
      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
47 47
   </requires>
48 48

  
49 49
   <plugin
tmp/org.txm.practically.rcp/src/practicallymacro/model/E4CommandHelper.java (revision 3079)
11 11
import org.eclipse.ui.PlatformUI;
12 12

  
13 13
public class E4CommandHelper {
14
	public static void addMCommandToSystem(Command newCommand)
15
	{
16
		try
17
		{
18
			IEclipseContext context=(IEclipseContext)PlatformUI.getWorkbench().getAdapter(IEclipseContext.class);
19
			Class commandsFactory=Class.forName("org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl");
20
			Field instanceField=commandsFactory.getField("INSTANCE");
21
			Method createCommand=commandsFactory.getMethod("createCommand");
22
			Object implInstance=instanceField.get(null);
23
			MCommand anMCommand=(MCommand)createCommand.invoke(implInstance);
24
//			MCommand anMCommand=CommandsFactoryImpl.INSTANCE.createCommand();
14
	
15
	public static void addMCommandToSystem(Command newCommand) {
16
		try {
17
			IEclipseContext context = PlatformUI.getWorkbench().getAdapter(IEclipseContext.class);
18
			Class<?> commandsFactory = Class.forName("org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl");
19
			Field instanceField = commandsFactory.getField("INSTANCE");
20
			Method createCommand = commandsFactory.getMethod("createCommand");
21
			Object implInstance = instanceField.get(null);
22
			MCommand anMCommand = (MCommand) createCommand.invoke(implInstance);
23
			// MCommand anMCommand=CommandsFactoryImpl.INSTANCE.createCommand();
25 24
			anMCommand.setElementId(newCommand.getId());
26
			try
27
			{
25
			try {
28 26
				anMCommand.setCommandName(newCommand.getName());
29 27
			}
30
			catch (Exception e)
31
			{
28
			catch (Exception e) {
32 29
				e.printStackTrace();
33 30
			}
34
			MApplication app=context.get(MApplication.class);
35
			List<MCommand> allCommands=app.getCommands();
36
			boolean commandExists=false;
37
			for (MCommand mcommand : allCommands)
38
			{
39
				if (mcommand.getElementId().equals(newCommand.getId()))
40
				{
41
					commandExists=true;
31
			MApplication app = context.get(MApplication.class);
32
			List<MCommand> allCommands = app.getCommands();
33
			boolean commandExists = false;
34
			for (MCommand mcommand : allCommands) {
35
				if (mcommand.getElementId().equals(newCommand.getId())) {
36
					commandExists = true;
42 37
					break;
43 38
				}
44 39
			}
45 40
			if (!commandExists)
46 41
				allCommands.add(anMCommand);
47 42
		}
48
		catch (Exception e)
49
		{
43
		catch (Exception e) {
50 44
			e.printStackTrace();
51 45
		}
52 46
		
tmp/org.txm.backtomedia.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.qualifier">
9 9

  
10 10
   <description url="https://groupes.renater.fr/wiki/txm-users/public/extensions#backtomedia">
11 11
      Video and audio player and BackToMedia command for record transcription based corpora with timing information (synchronized).
12 12
   </description>
13 13

  
14 14
   <copyright url="http://www.example.com/copyright">
15
      TXM 0.8.1
15
      TXM 0.8.2
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
......
39 39

  
40 40
   <requires>
41 41
      <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
42
      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
42
      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
43 43
      <import plugin="org.eclipse.core.runtime"/>
44 44
      <import plugin="org.eclipse.ui"/>
45 45
      <import plugin="org.eclipse.core.expressions" version="3.4.500" match="greaterOrEqual"/>
tmp/org.txm.xmleditor.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.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.1
15
      TXM 0.8.2
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
tmp/org.txm.libs.javafx.feature/feature.xml (revision 3079)
4 4
      label="org.txm.libs.javafx.feature"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description url="http://www.example.com/description">
10 10
      [Enter Feature Description here.]
tmp/org.txm.cooccurrence.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.qualifier">
9 9

  
10 10
   <description url="http://www.example.com/description">
11 11
      Cooccurrences
12 12
   </description>
13 13

  
14 14
   <copyright url="http://www.example.com/copyright">
15
      TXM 0.8.1
15
      TXM 0.8.2
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
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java (revision 3079)
196 196
	 * @param toCache
197 197
	 * @return
198 198
	 */
199
	public static ArrayList<?> uncache(Class classToUnCache) {
199
	public static ArrayList<?> uncache(Class<?> classToUnCache) {
200 200
		if (classToUnCache == null) {
201 201
			return null;
202 202
		}
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java (revision 3079)
477 477
	public static void main(String[] args) throws Exception {
478 478
		String pathToCQPLibDirectory = "/home/mdecorde/workspace047/org.txm.libs.cqp.linux/res/linux64/";
479 479
		String cqpserverPathToExecutable = pathToCQPLibDirectory + "cqpserver";
480
		String pathToRegistry = System.getProperty("user.home") + "TXM-0.8.1/corpora/DEMOCRATLYON5/registry";
480
		String pathToRegistry = System.getProperty("user.home") + "TXM-0.8.2/corpora/DEMOCRATLYON5/registry";
481 481
		String pathToInitFile = System.getProperty("user.home") + "workspace047/org.txm.libs.cqp.linux/res/cqpserver.init";
482 482
		
483 483
		String corpus = "DEMOCRATLYON5";
tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/view/ElementSearchView.java (revision 3079)
104 104
	
105 105
	private Corpus analecCorpus;
106 106
	
107
	private Class clazzSearched;
107
	private Class<? extends Element> clazzSearched;
108 108
	
109 109
	private String typeSearched;
110 110
	
......
430 430
	 * @param type the searched Element type
431 431
	 * @param toolbar the annotation toolbar which called loadType
432 432
	 */
433
	public void loadType(org.txm.searchengine.cqp.corpus.CQPCorpus corpus, Corpus analecCorpus, Class clazz, String type, URSAnnotationToolbar toolbar) {
433
	public void loadType(org.txm.searchengine.cqp.corpus.CQPCorpus corpus, Corpus analecCorpus, Class<? extends Element> clazz, String type, URSAnnotationToolbar toolbar) {
434 434
		if (toolbar == null || toolbar.isDisposed()) return;
435 435
		
436 436
		this.searchButton.setEnabled(true);
......
667 667
		}
668 668
	}
669 669
	
670
	private void setItems(Combo t, Class clazz, String type, String prop) {
670
	private void setItems(Combo t, Class<? extends Element> clazz, String type, String prop) {
671 671
		String[] items = vue.getValeursChamp(clazz, type, prop);
672 672
		t.setItems(items);
673 673
		KeyStroke keys = KeyStroke.getInstance(SWT.CONTROL, SWT.SPACE);
tmp/org.txm.ca.feature/feature.xml (revision 3079)
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.1.qualifier">
8
      license-feature-version="0.8.2.qualifier">
9 9

  
10 10
   <description url="http://www.example.com/description">
11 11
      Correspondence Analysis
12 12
   </description>
13 13

  
14 14
   <copyright url="http://www.example.com/copyright">
15
      TXM 0.8.1
15
      TXM 0.8.2
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
tmp/org.txm.groovy.feature/feature.xml (revision 3079)
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.1.qualifier">
7
      license-feature-version="0.8.2.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.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
......
37 37
   </license>
38 38

  
39 39
   <requires>
40
      <import plugin="org.txm.core" version="0.8.1" match="greaterOrEqual"/>
40
      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
41 41
   </requires>
42 42

  
43 43
   <plugin
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenLocalizedWebPage.java (revision 3079)
288 288
	}
289 289
	
290 290
	public static void main(String args[]) {
291
		String s = getValidURL("https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.1beta/", "https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.1beta");
291
		String s = getValidURL("https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.2beta/", "https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.2beta");
292 292
		System.out.println(s);
293 293
	}
294 294
}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/jface/ComboFieldEditor.java (revision 3079)
14 14
 *
15 15
 */
16 16
public class ComboFieldEditor extends org.eclipse.jface.preference.ComboFieldEditor {
17

  
17
	
18 18
	public ComboFieldEditor(String name, String labelText, String[][] entryNamesAndValues, Composite parent) {
19 19
		super(name, labelText, entryNamesAndValues, parent);
20 20
	}
21

  
21
	
22 22
	public String getStringValue() {
23 23
		
24 24
		Field field;
25 25
		try {
26
			Class clazz = this.getClass().getSuperclass();
26
			Class<?> clazz = this.getClass().getSuperclass();
27 27
			field = clazz.getDeclaredField("fCombo");
28 28
			field.setAccessible(true);
29 29
			Combo fCombo = (Combo) field.get(this);
30 30
			return fCombo.getText();
31
		} catch (Exception e) {
31
		}
32
		catch (Exception e) {
32 33
			e.printStackTrace();
33 34
			return null;
34 35
		}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java (revision 3079)
883 883
			}
884 884
		});
885 885
		
886
		// move previous TXM 0.8.1 corpora
886
		// move previous TXM 0.8.2 corpora
887 887
		File backupDir = new File(corporaDir.getAbsolutePath() + "-previous"); //$NON-NLS-1$
888 888
		if (corporaDir.exists()) {
889 889
			backupDir.mkdirs();
......
894 894
			}
895 895
		}
896 896
		
897
		// load TXM-0.8.1 sample corpora (from the install directory)
897
		// load TXM-0.8.2 sample corpora (from the install directory)
898 898
		if (corporaDirs.contains(SAMPLES) && sampleCorporaDirectory.exists()) {
899 899
			
900 900
			Log.info(TXMUIMessages.installingSampleCorpus);
......
909 909
			}
910 910
		}
911 911
		
912
		// TXM-0.8.1 previous installation corpora
912
		// TXM-0.8.2 previous installation corpora
913 913
		if (corporaDirs.contains(V081) && backupDir.listFiles(IOUtils.HIDDENFILE_FILTER).length > 0) { // not a new install, restore corpus from the corpora-previous directory
914
			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, "0.8.1", corporaDir)); //$NON-NLS-1$
914
			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, "0.8.2", corporaDir)); //$NON-NLS-1$
915 915
			JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(backupDir, false, false, true);
916 916
			try {
917 917
				job.join();
tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java (revision 3079)
43 43
 * @author jmague
44 44
 */
45 45
public class AdapterFactory implements IAdapterFactory {
46

  
46
	
47 47
	private static boolean firstCorpusDiag = true;
48

  
49
	private HashMap<Class, IWorkbenchAdapter> externalAdapters = new HashMap<Class, IWorkbenchAdapter>();
50

  
51
//	/** The corpus adapter. */
52
//	private IWorkbenchAdapter corpusAdapter = new IWorkbenchAdapter() {
53
//
54
//		@Override
55
//		public Object[] getChildren(Object corpus) {
56
//			ArrayList<TXMResult> results = ((Corpus) corpus).getChildren(true);
57
//			for (int i = 0; i < results.size(); i++) {
58
//				Object element = results.get(i);
59
//
60
//				// remove Text and SavedQuery from the corpora view
61
//				if (!TBXPreferences.getInstance().getBoolean(TBXPreferences.SHOW_ALL_RESULT_NODES) && (element instanceof Text || element instanceof SavedQuery)) {
62
//					results.remove(i);
63
//					i--;
64
//				}
65
//			}
66
//			List<Object> children = new ArrayList<Object>();
67
//			children.addAll(results);
68
//			return children.toArray();
69
//		}
70
//
71
//		@Override
72
//		public ImageDescriptor getImageDescriptor(Object object) {
73
//			return AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID, IImageKeys.CORPUS);
74
//		}
75
//
76
//		@Override
77
//		public String getLabel(Object corpus) {
78
//			if (corpus instanceof MainCorpus) {
79
//				return ((MainCorpus) corpus).getNameForCorporaView();
80
//			}
81
//			else {
82
//				return ((Corpus) corpus).getName();
83
//			}
84
//		}
85
//
86
//		@Override
87
//		public Object getParent(Object corpus) {
88
//			if (corpus instanceof Subcorpus) {
89
//				return ((Subcorpus) corpus).getMotherSubcorpus();
90
//			}
91
//			else {
92
//				return CorpusManager.getCorpusManager();
93
//			}
94
//		}
95
//	};
96

  
97
//	/** The partition adapter. */
98
//	private IWorkbenchAdapter partitionAdapter = new IWorkbenchAdapter() {
99
//
100
//		@Override
101
//		public Object[] getChildren(Object partition) {
102
//			ArrayList<TXMResult> children = ((Partition) partition).getResults();
103
//			// System.out.println("PARTITION RESULTS "+children);
104
//			return children.toArray();
105
//		}
106
//
107
//		@Override
108
//		public ImageDescriptor getImageDescriptor(Object object) {
109
//			return AbstractUIPlugin.imageDescriptorFromPlugin(
110
//					Application.PLUGIN_ID, IImageKeys.PARTITION);
111
//		}
112
//
113
//		@Override
114
//		public String getLabel(Object partition) {
115
//			return ((Partition) partition).getSimpleName();
116
//		}
117
//
118
//		@Override
119
//		public Object getParent(Object partition) {
120
//			return ((Partition) partition).getCorpus();
121
//		}
122
//	};
123

  
124

  
48
	
49
	private HashMap<Class<?>, IWorkbenchAdapter> externalAdapters = new HashMap<>();
50
	
51
	// /** The corpus adapter. */
52
	// private IWorkbenchAdapter corpusAdapter = new IWorkbenchAdapter() {
53
	//
54
	// @Override
55
	// public Object[] getChildren(Object corpus) {
56
	// ArrayList<TXMResult> results = ((Corpus) corpus).getChildren(true);
57
	// for (int i = 0; i < results.size(); i++) {
58
	// Object element = results.get(i);
59
	//
60
	// // remove Text and SavedQuery from the corpora view
61
	// if (!TBXPreferences.getInstance().getBoolean(TBXPreferences.SHOW_ALL_RESULT_NODES) && (element instanceof Text || element instanceof SavedQuery)) {
62
	// results.remove(i);
63
	// i--;
64
	// }
65
	// }
66
	// List<Object> children = new ArrayList<Object>();
67
	// children.addAll(results);
68
	// return children.toArray();
69
	// }
70
	//
71
	// @Override
72
	// public ImageDescriptor getImageDescriptor(Object object) {
73
	// return AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID, IImageKeys.CORPUS);
74
	// }
75
	//
76
	// @Override
77
	// public String getLabel(Object corpus) {
78
	// if (corpus instanceof MainCorpus) {
79
	// return ((MainCorpus) corpus).getNameForCorporaView();
80
	// }
81
	// else {
82
	// return ((Corpus) corpus).getName();
83
	// }
84
	// }
85
	//
86
	// @Override
87
	// public Object getParent(Object corpus) {
88
	// if (corpus instanceof Subcorpus) {
89
	// return ((Subcorpus) corpus).getMotherSubcorpus();
90
	// }
91
	// else {
92
	// return CorpusManager.getCorpusManager();
93
	// }
94
	// }
95
	// };
96
	
97
	// /** The partition adapter. */
98
	// private IWorkbenchAdapter partitionAdapter = new IWorkbenchAdapter() {
99
	//
100
	// @Override
101
	// public Object[] getChildren(Object partition) {
102
	// ArrayList<TXMResult> children = ((Partition) partition).getResults();
103
	// // System.out.println("PARTITION RESULTS "+children);
104
	// return children.toArray();
105
	// }
106
	//
107
	// @Override
108
	// public ImageDescriptor getImageDescriptor(Object object) {
109
	// return AbstractUIPlugin.imageDescriptorFromPlugin(
110
	// Application.PLUGIN_ID, IImageKeys.PARTITION);
111
	// }
112
	//
113
	// @Override
114
	// public String getLabel(Object partition) {
115
	// return ((Partition) partition).getSimpleName();
116
	// }
117
	//
118
	// @Override
119
	// public Object getParent(Object partition) {
120
	// return ((Partition) partition).getCorpus();
121
	// }
122
	// };
123
	
124
	
125 125
	/** The Lexicon adapter. */
126 126
	// FIXME: became useless? seems never used
127 127
	private IWorkbenchAdapter LexiconAdapter = new TXMResultAdapter() {
128
		
128 129
		@Override
129 130
		public ImageDescriptor getImageDescriptor(Object object) {
130 131
			return AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID, IImageKeys.ACTION_FREQUENCY_LIST);
131 132
		}
132 133
	};
133

  
134
	
134 135
	/**
135 136
	 * Gets the adapter.
136 137
	 *
......
138 139
	 * @param adapterType the adapter type
139 140
	 * @return the adapter
140 141
	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
141
	 * java.lang.Class)
142
	 *      java.lang.Class)
142 143
	 */
143 144
	@Override
144
	public Object getAdapter(Object adaptableObject, Class adapterType) {
145
//		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof CorpusManager) {
146
//			return corpusManagerAdapter;
147
//		}
148
//		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Corpus) {
149
//			return corpusAdapter;
150
//		}
151
//		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Partition) {
152
//			return partitionAdapter;
153
//		}
154

  
155
		//check adapters from plugins
145
	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
146
		// if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof CorpusManager) {
147
		// return corpusManagerAdapter;
148
		// }
149
		// if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Corpus) {
150
		// return corpusAdapter;
151
		// }
152
		// if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Partition) {
153
		// return partitionAdapter;
154
		// }
155
		
156
		// check adapters from plugins
156 157
		if (externalAdapters.containsKey(adaptableObject.getClass())) {
157
			return externalAdapters.get(adaptableObject.getClass());
158
			return adapterType.cast(externalAdapters.get(adaptableObject.getClass()));
158 159
		}
159 160
		
160
		if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof TXMResult)	{
161
			return new TXMResultAdapter() {
161
		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof TXMResult) {
162
			return adapterType.cast(new TXMResultAdapter() {
163
				
162 164
				@Override
163 165
				public ImageDescriptor getImageDescriptor(Object object) {
164 166
					return AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID, IImageKeys.ACTION_INFO);
165 167
				}
166
			};
168
			});
167 169
		}
168 170
		return null;
169 171
	}
170

  
172
	
171 173
	/**
172 174
	 * Gets the adapter list.
173 175
	 *
......
175 177
	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
176 178
	 */
177 179
	@Override
178
	@SuppressWarnings("unchecked") //$NON-NLS-1$
179
	public Class[] getAdapterList() {
180
	@SuppressWarnings("unchecked")
181
	public Class<?>[] getAdapterList() {
180 182
		return new Class[] { IWorkbenchAdapter.class };
181 183
	}
182

  
183
}
184
	
185
}
tmp/org.txm.rcp/plugin.xml (revision 3079)
52 52
         </property>
53 53
         <property
54 54
               name="aboutText"
55
               value="&lt;TXM Software User Agreement&gt;&#x0A;&#x0A;TXM 0.8.1 Copyright © 2010-2020 ENS de Lyon, University of Franche-Comté, CNRS&#x0A;&#x0A;&lt;English version below&gt;&#x0A;&#x0A;EN ACCEPTANT CETTE MISE À JOUR ET EN UTILISANT TXM, VOUS VOUS ENGAGEZ À CITER L&apos;ARTICLE DE RÉFÉRENCE DE LA PLATEFORME* DANS VOS PUBLICATIONS DE RÉSULTATS OBTENUS À PARTIR D&apos;ELLE. CELA EST ESSENTIEL POUR NOUS PERMETTRE DE JUSTIFIER LE BESOIN DE PÉRENNISATION DE CET INSTRUMENT DE TRAVAIL POUR LA COMMUNAUTÉ SCIENTIFIQUE.&#x0A;&#x0A;Le logiciel TXM est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier suivant les termes de la Licence publique générale GNU telle que publiée par la Free Software Foundation, soit la version 2 de cette License, soit une version ultérieure.&#x0A;&#x0A;Le logiciel TXM est distribué dans l&apos;espoir qu&apos;il sera utile, mais sans aucune garantie, y compris mais non de façon limitative les garanties implicites de qualité marchande et de convenance à un usage particulier. Consultez la version 2 et la version 3 de la Licence publique générale GNU pour plus de détails.&#x0A;&#x0A;Vous devriez avoir reçu une copie de la Licence publique générale GNU en accompagnement du logiciel TXM ; si ce n&apos;est pas le cas, veuillez consulter la page http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;* Serge Heiden, Jean-Philippe Magué, Bénédicte Pincemin.&#x0A;TXM : Une plateforme logicielle open-source pour la textométrie - conception et développement. Sergio Bolasco, Isabella Chiari, Luca Giuliano. 10th International Conference on the Statistical Analysis of Textual Data - JADT 2010, Jun 2010, Rome, Italie.&#x0A;Edizioni Universitarie di Lettere Economia Diritto, 2 (3), pp.1021-1032, 2010. &lt;halshs-00549779&gt;&#x0A;&#x0A;&#x0A;ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH&#x0A;&#x0A;&#x0A;By accepting this update and by using TXM, you agree to cite the TXM platform reference article** in your publications of results obtained from it. That is essential for us to justify the need for sustainability of this instrument for the scientific community.&#x0A;&#x0A;The TXM platform is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.&#x0A;&#x0A;The TXM platform is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&#x0A;&#x0A;You should have received a copy of the GNU General Public License along with the TXM platform. If not, see http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;** Serge Heiden. The TXM Platform: Building Open-Source Textual&#x0A;Analysis Software Compatible with the TEI Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa, Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada. 24th Pacific Asia Conference on Language, Information and Computation, Nov 2010, Sendai, Japan. Institute for Digital Enhancement of Cognitive Development, Waseda University, pp.389-398, 2010. &lt;halshs-00549764&gt;">
55
               value="&lt;TXM Software User Agreement&gt;&#x0A;&#x0A;TXM 0.8.2 Copyright © 2010-2020 ENS de Lyon, University of Franche-Comté, CNRS&#x0A;&#x0A;&lt;English version below&gt;&#x0A;&#x0A;EN ACCEPTANT CETTE MISE À JOUR ET EN UTILISANT TXM, VOUS VOUS ENGAGEZ À CITER L&apos;ARTICLE DE RÉFÉRENCE DE LA PLATEFORME* DANS VOS PUBLICATIONS DE RÉSULTATS OBTENUS À PARTIR D&apos;ELLE. CELA EST ESSENTIEL POUR NOUS PERMETTRE DE JUSTIFIER LE BESOIN DE PÉRENNISATION DE CET INSTRUMENT DE TRAVAIL POUR LA COMMUNAUTÉ SCIENTIFIQUE.&#x0A;&#x0A;Le logiciel TXM est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier suivant les termes de la Licence publique générale GNU telle que publiée par la Free Software Foundation, soit la version 2 de cette License, soit une version ultérieure.&#x0A;&#x0A;Le logiciel TXM est distribué dans l&apos;espoir qu&apos;il sera utile, mais sans aucune garantie, y compris mais non de façon limitative les garanties implicites de qualité marchande et de convenance à un usage particulier. Consultez la version 2 et la version 3 de la Licence publique générale GNU pour plus de détails.&#x0A;&#x0A;Vous devriez avoir reçu une copie de la Licence publique générale GNU en accompagnement du logiciel TXM ; si ce n&apos;est pas le cas, veuillez consulter la page http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;* Serge Heiden, Jean-Philippe Magué, Bénédicte Pincemin.&#x0A;TXM : Une plateforme logicielle open-source pour la textométrie - conception et développement. Sergio Bolasco, Isabella Chiari, Luca Giuliano. 10th International Conference on the Statistical Analysis of Textual Data - JADT 2010, Jun 2010, Rome, Italie.&#x0A;Edizioni Universitarie di Lettere Economia Diritto, 2 (3), pp.1021-1032, 2010. &lt;halshs-00549779&gt;&#x0A;&#x0A;&#x0A;ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH&#x0A;&#x0A;&#x0A;By accepting this update and by using TXM, you agree to cite the TXM platform reference article** in your publications of results obtained from it. That is essential for us to justify the need for sustainability of this instrument for the scientific community.&#x0A;&#x0A;The TXM platform is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.&#x0A;&#x0A;The TXM platform is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&#x0A;&#x0A;You should have received a copy of the GNU General Public License along with the TXM platform. If not, see http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;** Serge Heiden. The TXM Platform: Building Open-Source Textual&#x0A;Analysis Software Compatible with the TEI Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa, Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada. 24th Pacific Asia Conference on Language, Information and Computation, Nov 2010, Sendai, Japan. Institute for Digital Enhancement of Cognitive Development, Waseda University, pp.389-398, 2010. &lt;halshs-00549764&gt;">
56 56
         </property>
57 57
         <property
58 58
               name="startupProgressRect"
tmp/org.txm.cql2lsa.feature/feature.xml (revision 3079)
4 4
      label="CQL2LSA"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description url="http://www.example.com/description">
10 10
      Commands for LSA computations
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
14
      TXM 0.8.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
......
37 37
   </license>
38 38

  
39 39
   <requires>
40
      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
40
      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
41 41
   </requires>
42 42

  
43 43
   <plugin
tmp/org.txm.dictionary.feature/feature.xml (revision 3079)
4 4
      label="Dictionary"
5 5
      version="1.0.0.qualifier"
6 6
      license-feature="org.txm.rcp.feature"
7
      license-feature-version="0.8.1.qualifier">
7
      license-feature-version="0.8.2.qualifier">
8 8

  
9 9
   <description url="http://www.example.com/description">
10 10
      Dictionnary
11 11
   </description>
12 12

  
13 13
   <copyright url="http://www.example.com/copyright">
14
      TXM 0.8.1
14
      TXM 0.8.2
15 15
Copyright © 2013-2020 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
......
37 37
   </license>
38 38

  
39 39
   <requires>
40
      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
40
      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
41 41
      <import plugin="org.txm.libs.groovy-all" version="2.3.3" match="greaterOrEqual"/>
42 42
      <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
43 43
      <import plugin="org.eclipse.ui"/>
tmp/org.txm.tokenizer.core/src/org/txm/tokenizer/SimpleStringTokenizer.groovy (revision 3079)
250 250
			["fr", "C'est un autre test."],
251 251
			[
252 252
				"fr",
253
				"C'est une version 0.8.1 un 01:12:12 test vers http://un.site.web.fr, fin."
253
				"C'est une version 0.8.2 un 01:12:12 test vers http://un.site.web.fr, fin."
254 254
			],
255 255
			["en", "This is a test."],
256 256
			["en", "It's a test."]
tmp/org.txm.libs.javafx.linux/META-INF/MANIFEST.MF (revision 3079)
37 37
 com.sun.javafx.font.coretext,
38 38
 com.sun.javafx.font.directwrite,
39 39
 com.sun.javafx.font.freetype,
40
 com.sun.javafx.font.t2k,
41 40
 com.sun.javafx.fxml,
42 41
 com.sun.javafx.fxml.builder,
43 42
 com.sun.javafx.fxml.expression,
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/adapters/CAAdapterFactory.java (revision 3079)
15 15
 * @author sjacquot
16 16
 */
17 17
public class CAAdapterFactory extends TXMResultAdapterFactory {
18

  
18
	
19 19
	public static final ImageDescriptor ICON = AbstractUIPlugin.imageDescriptorFromPlugin(
20 20
			FrameworkUtil.getBundle(CAAdapterFactory.class).getSymbolicName(),
21 21
			"platform:/plugin/" + FrameworkUtil.getBundle(CAAdapterFactory.class).getSymbolicName() + "/icons/ca.png"); //$NON-NLS-1$ //$NON-NLS-2$
22

  
22
	
23 23
	/**
24 24
	 * Gets the adapter.
25 25
	 *
......
32 32
	 *      java.lang.Class)
33 33
	 */
34 34
	@Override
35
	public Object getAdapter(Object adaptableObject, Class adapterType) {
35
	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
36 36
		if (this.canAdapt(adapterType) && adaptableObject instanceof CA) {
37
			return new TXMResultAdapter() {
37
			return adapterType.cast(new TXMResultAdapter() {
38
				
38 39
				@Override
39 40
				public ImageDescriptor getImageDescriptor(Object object) {
40 41
					return ICON;
41 42
				}
42
			};
43
			});
43 44
		}
44 45
		return null;
45 46
	}
tmp/org.txm.setups/shared/debian/usr/bin/TXM (revision 3079)
158 158
#DEBUGOPTIONS="-log -clean -debug -console -noexit"
159 159
) 1>&3 2>&4
160 160

  
161
#author: sheiden
162
ubuntuubuntuversion=`lsb_release -r | sed -e 's/^Release:\t//g' -e 's/\..*//g'`
163 161

  
164
# test release number syntax
165
if [[ ! "$ubuntuubuntuversion" =~ ^[0-9]+$ ]]
166
then
167
	echo "** error: wrong release number"
168
	exit 1
169
fi
170

  
171 162
#author: sheiden
172 163
ubuntuubuntuversion=`lsb_release -r | sed -e 's/^Release:\t//g' -e 's/\..*//g'`
173 164

  
......
180 171

  
181 172
# test range
182 173
ACTIVATEGTK3=1
183
if [ "$ubuntuubuntuversion" -lt 20 ]
184
then
185
	ACTIVATEGTK3=0
186
fi
174
#if [ "$ubuntuubuntuversion" -lt 20 ]
175
#then
176
#	ACTIVATEGTK3=0
177
#fi
187 178

  
188 179
SWT_GTK3=$ACTIVATEGTK3 UBUNTU_MENUPROXY=0 exec "${TXMINSTALL}/launcher" "$@" -run --launcher.ini "$DOTTXMHOME/launcher.ini" $DEBUGOPTIONS -configuration "$DOTTXMHOME/configuration" -user "$DOTTXMHOME/user" -install "$TXMINSTALL"
tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java (revision 3079)
292 292
		String[] rownames = new String[lines.size()];
293 293
		String[] colnames = new String[npart];
294 294
		
295
		int i = 0 ;
295
		int i = 0;
296 296
		for (String k : lines.keySet()) {
297 297
			QueryIndexLine line = lines.get(k);
298 298
			int[] linefreqs = line.getFreqs();
......
370 370
	}
371 371
	
372 372
	@Override
373
	public Object getAdapter(Class adapterType) {
373
	public <T> T getAdapter(Class<T> adapterType) {
374 374
		// TODO Auto-generated method stub
375 375
		if (adapterType == IWorkbenchAdapter.class)
376
			return queryIndexOfTextAdapter;
376
			return adapterType.cast(queryIndexOfTextAdapter);
377 377
		return null;
378 378
	}
379 379
	
tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java (revision 3079)
531 531
	}
532 532
	
533 533
	@Override
534
	public Object getAdapter(Class adapterType) {
534
	public <T> T getAdapter(Class<T> adapterType) {
535
		
535 536
		if (adapterType == IWorkbenchAdapter.class)
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff