Révision 413

tmp/org.txm.lexicon.core/src/org/txm/lexicon/core/corpusengine/cqp/Lexicon.java (revision 413)
38 38
import java.util.Map;
39 39

  
40 40
import org.txm.core.messages.TXMCoreMessages;
41
import org.txm.core.results.ITXMResult;
42
import org.txm.functions.Function;
41
import org.txm.core.results.TXMResult;
42
import org.txm.functions.TXMCommand;
43 43
import org.txm.lexicon.core.messages.LexiconCoreMessages;
44 44
import org.txm.searchengine.cqp.ICqiClient;
45 45
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
......
62 62
 * {@link Subcorpus}) and a {@link Property}.
63 63
 * @author sloiseau
64 64
 */
65
public class Lexicon extends Function {
65
public class Lexicon extends TXMCommand {
66 66

  
67 67
	
68 68
	/** The prefix r. */
......
225 225
	 * {@link Corpus#getLexicon(Property)} or
226 226
	 * {@link Subcorpus#getLexicon(Property)}.
227 227
	 */
228
	protected void init(ITXMResult corpus, Property property, int[] freq, int[] ids) {
228
	protected void init(TXMResult corpus, Property property, int[] freq, int[] ids) {
229 229
		if (freq.length != ids.length)
230 230
			throw new IllegalArgumentException(LexiconCoreMessages.Lexicon_0);
231 231
		this.freqs = freq;
......
558 558
	 * @throws CqiClientException
559 559
	 */
560 560
	public static Lexicon getLexicon(Corpus corpus, Property property) throws CqiClientException {
561
		ArrayList<ITXMResult> results = corpus.getResults(Lexicon.class);
562
		for (ITXMResult result : results) {
561
		ArrayList<TXMResult> results = corpus.getResults(Lexicon.class);
562
		for (TXMResult result : results) {
563 563
			Lexicon lex = (Lexicon)result;
564 564
			if (lex.getProperty().equals(property)) {
565 565
				return lex;

Formats disponibles : Unified diff