/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

+    	}
     	@Override
     	protected boolean _compute(boolean update) {
     	protected boolean _compute() {
     //		// FIXME: source must always be an Index because the corpus source produces an Index
     //		// from corpus
     //		if (source instanceof Corpus)	{

     	 */
     	public final static String FONT = PREFERENCES_PREFIX +  "font"; //$NON-NLS-1$
     	/**
     	 * Same style for all lines.
     	 */
     	public static final String MULTIPLE_LINE_STROKES = PREFERENCES_PREFIX + "multiple_line_strokes"; //$NON-NLS-1$
     	// local result preferences
     	public final static String CHART_TYPE = PREFERENCES_PREFIX +  "chart_type"; //$NON-NLS-1$
     	public final static String RESULT_DATA_TYPE = PREFERENCES_PREFIX +  "result_data_type"; //$NON-NLS-1$
     	/**
     	 * Default font string representation.
     	 */
-...
     		preferences.putBoolean(SHOW_GRID, true);
     		preferences.putInt(RENDERING_COLORS_MODE, ChartsEngine.RENDERING_COLORS_MODE);
     		preferences.put(MONOCHROME_COLOR, "0,220,20"); //$NON-NLS-1$
     		preferences.putBoolean(MULTIPLE_LINE_STROKES, false);
     		preferences.put(CHART_TYPE, DEFAULT_CHART_TYPE);
     		// FIXME: maybe need need to check here the target OS and set a default Unicode installed font

     package org.txm.chartsengine.core.results;
     import java.lang.reflect.Field;
     import java.util.ArrayList;
     import java.util.Arrays;
     import java.util.HashMap;
     import java.util.List;
     import org.eclipse.core.runtime.IProgressMonitor;
-...
     	/**
     	 * Multiple lines styles/strokes.
     	 */
     	@Parameter(key=ChartsEnginePreferences.MULTIPLE_LINE_STROKES, type=Parameter.RENDERING)
     	protected boolean multipleLineStrokes;
     	/**
+    	 *
     	 * @param parent
     	 */
-...
     	@Override
     	public boolean compute(boolean update, IProgressMonitor monitor) throws Exception {
     	public boolean compute(IProgressMonitor monitor) throws Exception {
     		// FIXME: Debug
     		System.err.println("************** ChartResult.compute(): computing result of type " + this.getClass() + "...");
     //
     		// compute the result if needed
     		if(super.compute(update, monitor, false))	{
     		if(super.compute(monitor, false))	{
     			// compute the chart
     			return renderChart(update);
     			return renderChart();
+    		}
     		else	{
     			return false;
-...
     	 * @return
     	 * @throws Exception
     	 */
     	protected boolean renderChart(boolean update) throws Exception {
     	protected boolean renderChart() throws Exception {
     		this.subTask("Rendering chart.");
-...
     		return false;
+    	}
     	@Override
     	public String dumpParameters() {
     		return super.dumpParameters() + "\n" + this.dumpParameters(Parameter.RENDERING);
+    	}
     	/**
     	 * Updates the parameters used for last rendering.
+    	 *
-...
     		return TXMPreferences.isEmpty(this.preferencesNodeQualifier, key);
+    	}
     	/**
     	 * @return the monoStyle
     	 */
     	public boolean isMultipleLineStrokes() {
     		return multipleLineStrokes;
+    	}
     	/**
     	 * @param multipleStrokes the monoStyle to set
     	 */
     	public void setMultipleLineStrokes(boolean multipleStrokes) {
     		this.multipleLineStrokes = multipleStrokes;
+    	}
     	// FIXME
     //	public Object createChart(IProgressMonitor monitor, String chartType)	{
     //		Object chart = null;

     	@Override
     	protected boolean _compute(boolean update) throws Exception {
     	protected boolean _compute() throws Exception {
     		System.err.println("Summary.compute() not implemented");
     		return false;
+    	}

     	@Override
     	protected boolean _compute(boolean update) throws Exception {
     	protected boolean _compute() throws Exception {
     		if (partition != null) {
     			return computePartition();
     		} else {

+    	}
     	@Override
     	protected boolean _compute(boolean update) throws Exception {
     	protected boolean _compute() throws Exception {
     		this.beginTask("Computing informations...", 3);
     		stepGeneralInfos();

tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/selection/Selection.java (revision 615)
515	515	}
516	516
517	517	@Override
518		protected boolean _compute(boolean update) throws Exception {
	518	protected boolean _compute() throws Exception {
519	519	System.err.println("Selection.compute() not implemented");
520	520	return false;
521	521	}

tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java (revision 615)
724	724	}
725	725
726	726	@Override
727		protected boolean _compute(boolean update) throws Exception {
	727	protected boolean _compute() throws Exception {
728	728	// TODO Auto-generated method stub
729	729	return true;
730	730	}

     import org.txm.chartsengine.rcp.editors.ChartEditorPart;
     import org.txm.core.results.TXMResult;
     import org.txm.lexicaltable.core.functions.LexicalTable;
     import org.txm.lexicaltable.core.functions.LexicalTableFactory;
     import org.txm.lexicaltable.core.functions.___LexicalTableFactory;
     import org.txm.lexicaltable.rcp.editors.LexicalTableDialog;
     import org.txm.rcp.RCPMessages;
     import org.txm.rcp.StatusLine;
-...
     			// FIXME: old code
     			//ChartEditorPart.compute(ca);
     			// FIXME: new code
     			ca.compute(false);
     			ca.compute();
     			try {

+    	 *
     	 * @return true, if successful
     	 */
     	protected boolean _compute(boolean update)
+    	{
     	protected boolean _compute() {
     		try {
     			if (!getQueryMatches())
     				return false;

+    	}
     	@Override
     	protected boolean _compute(boolean update) throws StatException {
     	protected boolean _compute() throws StatException {
     		itable = table.getData();
     		colNames = itable.getColNames().asStringsArray();
     		rowNames = itable.getRowNames().asStringsArray();

     import org.txm.core.results.TXMParameters;
     import org.txm.core.results.TXMResult;
     import org.txm.lexicaltable.core.functions.LexicalTable;
     import org.txm.lexicaltable.core.functions.LexicalTableFactory;
     import org.txm.lexicaltable.core.statsengine.data.ILexicalTable;
     import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
     import org.txm.lexicon.core.corpusengine.cqp.Lexicon;
     //import org.txm.progression.core.functions.Progression;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.Corpus;
     import org.txm.searchengine.cqp.corpus.Partition;
     import org.txm.searchengine.cqp.corpus.Property;
     import org.txm.searchengine.cqp.corpus.Subcorpus;
     import org.txm.specificities.core.messages.SpecificitiesCoreMessages;
     import org.txm.stat.engine.r.RDevice;
     import org.txm.stat.engine.r.RWorkspaceRenderer;
     import org.txm.statsengine.core.StatException;
     import org.txm.statsengine.core.data.Vector;
     import org.txm.statsengine.r.core.RWorkspace;
     //import org.txm.progression.core.functions.Progression;
     public abstract class Contrast extends TXMResult{
-...
     //		symbol = "Contrast_"+this.getClass().getSimpleName()+"_"+(no_contrast++);
     //	}
     	protected abstract boolean _compute(boolean update) throws Exception;
     	public abstract String getName();

+    	}
     	@Override
     	protected boolean _compute(boolean update) throws Exception {
     	protected boolean _compute() throws Exception {
     		itable = table.getData();
     		colNames = itable.getColNames().asStringsArray();
     		rowNames = itable.getRowNames().asStringsArray();

+    	}
     	@Override
     	protected boolean _compute(boolean update) throws StatException {
     	protected boolean _compute() throws StatException {
     		itable = table.getData();
     		colNames = itable.getColNames().asStringsArray();
     		rowNames = itable.getRowNames().asStringsArray();

tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrasts.java (revision 615)
39	39	public boolean compute() throws Exception {
40	40	for (Contrast m : mesures) {
41	41	System.out.println(TXMCoreMessages.Contrasts_0+m.getName());
42		m.compute(false);
	42	m.compute();
43	43	}
44	44	return true;
45	45	}

+    	}
     	@Override
     	protected boolean _compute(boolean update) throws StatException {
     	protected boolean _compute() throws StatException {
     		itable = table.getData();
     		colNames = itable.getColNames().asStringsArray();
     		rowNames = itable.getRowNames().asStringsArray();

+    	}
     	@Override
     	protected boolean _compute(boolean update) throws Exception {
     	protected boolean _compute() throws Exception {
     		SpecificitiesR si = new SpecificitiesR(lexicalTable.getData());

tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java (revision 615)
146	146	}
147	147
148	148	@Override
149		protected boolean _compute(boolean update) throws Exception {
	149	protected boolean _compute() throws Exception {
150	150	// does nothing
151	151	return true;
152	152	}

     		// on fait une afc
     		//EN: compute the CA
     		def ca = new CA(table)
     		ca.processFromTable();
     		ca.compute();
     timer.stop()
     println "calcul de l'AFC 1 : "+timer.toString()
-...
     // on fait une afc
     //EN: we compute a CA
     def ca2 = new CA(table)
     ca2.processFromTable();
     ca2.compute();
     timer.stop()
     println "calcul de la deuxième AFC : "+timer.toString()
     timer.reset()

     package org.txm.lexicaltable.core.functions;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
     import org.txm.lexicon.core.corpusengine.cqp.Lexicon;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.Corpus;
     import org.txm.searchengine.cqp.corpus.Partition;
     import org.txm.searchengine.cqp.corpus.Property;
     import org.txm.searchengine.cqp.corpus.Subcorpus;
     import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
     public class LexicalTableFactory {
     	/**
     	 * Create a Complete Lexical Table according to a Partition and a Property.
+    	 *
     	 * @param partition the partition
     	 * @param analysisProperty the analysis property
     	 * @param fMin the fmin
     	 * @param vmax
     	 * @return the lexical table
     	 * @throws CqiClientException the cqi client exception
     	 * @throws RWorkspaceException the r workspace exception
     	 */
     	public static final LexicalTable getLexicalTable(Partition partition, Property analysisProperty, int fMin, int vMax) throws Exception {
     		//long time = System.currentTimeMillis();
     		List<Lexicon> lexicons = new ArrayList<Lexicon>();
     		// Set<String> allLexiconEntry = new HashSet<String>();
     		for (int i = 0; i < partition.getNPart(); i++) {
     			Lexicon l = new Lexicon(partition.getParts().get(i));
     			l.setProperty(analysisProperty);
     			l.compute(null);
     			lexicons.add(l);
+    		}
     		//System.out.println("time lexicon build "+(System.currentTimeMillis()-time));
     		//time = System.currentTimeMillis();
     		// String[] entries = allLexiconEntry.toArray(new String[]{});
     		Corpus c = partition.getCorpus();
     		Lexicon ll = new Lexicon(c);
     		ll.setProperty(analysisProperty);
     		ll.compute(null);
     		ArrayList<String> filteredForms = new ArrayList<String>();
     		//create a copy and filter line with Fmin;
     		for (int i = 0 ; i < ll.getFreq().length ; i++) {
     			if (ll.getFreq()[i] >= fMin) {
     				filteredForms.add(ll.getForms()[i]);
+    			}
+    		}
     		//System.out.println("remove freq too low "+(System.currentTimeMillis()-time));
     		//time = System.currentTimeMillis();
     		Map<String, Integer> entries2index = new HashMap<String, Integer>();
     		for (int i = 0; i < filteredForms.size(); i++) {
     			entries2index.put(filteredForms.get(i), i);
+    		}
     		//System.out.println("entries2index "+(System.currentTimeMillis()-time));
     		//time = System.currentTimeMillis();
     		int[][] mat = new int[filteredForms.size()][lexicons.size()];//DoubleFactory2D.sparse.make(filteredForms.size(), lexicons.size(), 0);
     		Integer id= null;
     		for (int i = 0; i < lexicons.size(); i++) {
     			Lexicon l = lexicons.get(i);
     			String[] ents = l.getForms();
     			int[] freqs = l.getFreq();
     			for (int j = 0; j < freqs.length; j++) {
     				id = entries2index.get(ents[j]);
     				// if (entriesFreqs[id] >= 2)
     				if (id != null) {
     					mat[id][i] = freqs[j]; //mat.setQuick(id, i, freqs[j]);
+    				}
+    			}
+    		}
     		//System.out.println("time build matrix "+(System.currentTimeMillis()-time));
     		//time = System.currentTimeMillis();
     		//System.out.println("Entries size " + filteredForms.size());
     		//System.out.println("mat size " + mat.rows());
     		//System.out.println("mat columns " + mat.columns());
     		LexicalTableImpl iTable = new LexicalTableImpl(mat, filteredForms.toArray(new String[]{}), partition.getPartShortNames().toArray(new String[] {}));
     		LexicalTable table = new LexicalTable(partition, analysisProperty, fMin, vMax, iTable);
     		//System.out.println("time build table lexical "+(System.currentTimeMillis()-time));
     		return table;
+    	}
     	/**
+    	 *
     	 * @param subcorpus
     	 * @param property
     	 * @return
     	 * @throws Exception
     	 */
     	public static LexicalTable getLexicalTable(Subcorpus subcorpus, Property property) throws Exception {
     		return new LexicalTable(subcorpus, property);
+    	}
+    }

     	@Override
     	protected boolean _compute(boolean update) throws Exception {
     	protected boolean _compute() throws Exception {
     		if (this.parent instanceof Subcorpus) {

     package org.txm.lexicaltable.core.functions;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
     import org.txm.lexicon.core.corpusengine.cqp.Lexicon;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.Corpus;
     import org.txm.searchengine.cqp.corpus.Partition;
     import org.txm.searchengine.cqp.corpus.Property;
     import org.txm.searchengine.cqp.corpus.Subcorpus;
     import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
     // FIXME: became useless?
     @Deprecated
     public class ___LexicalTableFactory {
     	/**
     	 * Create a Complete Lexical Table according to a Partition and a Property.
+    	 *
     	 * @param partition the partition
     	 * @param analysisProperty the analysis property
     	 * @param fMin the fmin
     	 * @param vmax
     	 * @return the lexical table
     	 * @throws CqiClientException the cqi client exception
     	 * @throws RWorkspaceException the r workspace exception
     	 */
     	public static final LexicalTable getLexicalTable(Partition partition, Property analysisProperty, int fMin, int vMax) throws Exception {
     		//long time = System.currentTimeMillis();
     		List<Lexicon> lexicons = new ArrayList<Lexicon>();
     		// Set<String> allLexiconEntry = new HashSet<String>();
     		for (int i = 0; i < partition.getNPart(); i++) {
     			Lexicon l = new Lexicon(partition.getParts().get(i));
     			l.setProperty(analysisProperty);
     			l.compute(null);
     			lexicons.add(l);
+    		}
     		//System.out.println("time lexicon build "+(System.currentTimeMillis()-time));
     		//time = System.currentTimeMillis();
     		// String[] entries = allLexiconEntry.toArray(new String[]{});
     		Corpus c = partition.getCorpus();
     		Lexicon ll = new Lexicon(c);
     		ll.setProperty(analysisProperty);
     		ll.compute(null);
     		ArrayList<String> filteredForms = new ArrayList<String>();
     		//create a copy and filter line with Fmin;
     		for (int i = 0 ; i < ll.getFreq().length ; i++) {
     			if (ll.getFreq()[i] >= fMin) {
     				filteredForms.add(ll.getForms()[i]);
+    			}
+    		}
     		//System.out.println("remove freq too low "+(System.currentTimeMillis()-time));
     		//time = System.currentTimeMillis();
     		Map<String, Integer> entries2index = new HashMap<String, Integer>();
     		for (int i = 0; i < filteredForms.size(); i++) {
     			entries2index.put(filteredForms.get(i), i);
+    		}
     		//System.out.println("entries2index "+(System.currentTimeMillis()-time));
     		//time = System.currentTimeMillis();
     		int[][] mat = new int[filteredForms.size()][lexicons.size()];//DoubleFactory2D.sparse.make(filteredForms.size(), lexicons.size(), 0);
     		Integer id= null;
     		for (int i = 0; i < lexicons.size(); i++) {
     			Lexicon l = lexicons.get(i);
     			String[] ents = l.getForms();
     			int[] freqs = l.getFreq();
     			for (int j = 0; j < freqs.length; j++) {
     				id = entries2index.get(ents[j]);
     				// if (entriesFreqs[id] >= 2)
     				if (id != null) {
     					mat[id][i] = freqs[j]; //mat.setQuick(id, i, freqs[j]);
+    				}
+    			}
+    		}
     		//System.out.println("time build matrix "+(System.currentTimeMillis()-time));
     		//time = System.currentTimeMillis();
     		//System.out.println("Entries size " + filteredForms.size());
     		//System.out.println("mat size " + mat.rows());
     		//System.out.println("mat columns " + mat.columns());
     		LexicalTableImpl iTable = new LexicalTableImpl(mat, filteredForms.toArray(new String[]{}), partition.getPartShortNames().toArray(new String[] {}));
     		LexicalTable table = new LexicalTable(partition, analysisProperty, fMin, vMax, iTable);
     		//System.out.println("time build table lexical "+(System.currentTimeMillis()-time));
     		return table;
+    	}
     	/**
+    	 *
     	 * @param subcorpus
     	 * @param property
     	 * @return
     	 * @throws Exception
     	 */
     	public static LexicalTable getLexicalTable(Subcorpus subcorpus, Property property) throws Exception {
     		return new LexicalTable(subcorpus, property);
+    	}
+    }

     	protected static int nocah = 1;
     	@Override
     	protected boolean _compute(boolean update)	{
     	protected boolean _compute()	{
     		Log.info("Computing CAH...");
     		try {
     			// compute the lexical table
     			this.table.compute(update);
     			this.table.compute();
     			RWorkspace rw = RWorkspace.getRWorkspaceInstance();

     ProgressionDialog_10 = Progression : mauvaise expression régulière :
     ProgressionDialog_11 = Échelle des bandeaux
     ProgressionDialog_13 = Options d'affichage
     ProgressionDialog_14 = Style de ligne unique
     ProgressionDialog_14 = Styles de ligne multiples
     ProgressionDialog_15 = Répéter les valeurs identiques
     ProgressionDialog_16 = N/B
     ProgressionDialog_17 = Erreur : multiplicateur de bande :

     ProgressionDialog_0 = Progression Parameters
     ProgressionDialog_1 = Graph type:
     ProgressionDialog_0  = Progression Parameters
     ProgressionDialog_1  = Graph type:
     ProgressionDialog_10 = Progression dialog: wrong regular expression:
     ProgressionDialog_11 = Bandewidth multiplier:
     ProgressionDialog_13 = Display options
     ProgressionDialog_14 = Single line style
     ProgressionDialog_14 = Multiple line styles
     ProgressionDialog_15 = Repeat same values
     ProgressionDialog_16 = Monochrome
     ProgressionDialog_17 = Strip multiplier error:
     ProgressionDialog_2  = cumulative
     ProgressionDialog_3  = density
     ProgressionDialog_4  = Structural Unit:
     ProgressionDialog_5  = delete
     ProgressionDialog_7  = Regex:
     ProgressionDialog_8  = Queries:
     ProgressionDialog_9  = add a query
     ProgressionDialog_2 = cumulative
     ProgressionDialog_3 = density
     ProgressionDialog_4 = Structural Unit:
     ProgressionDialog_5 = delete
     ProgressionDialog_7 = Regex:
     ProgressionDialog_8 = Queries:
     ProgressionDialog_9 = add a query
     ProgressionPreferencePage_3 = Default graph type is cumulative
     ProgressionPreferencePage_5 = Single line style
     ProgressionPreferencePage_6 = Repeat the values of the structure properties
     ProgressionPreferencePage_7 = Bande size multiplier

     import java.util.regex.Pattern;
     import java.util.regex.PatternSyntaxException;
     import org.eclipse.jface.viewers.ComboViewer;
     import org.eclipse.swt.SWT;
     import org.eclipse.swt.custom.ScrolledComposite;
     import org.eclipse.swt.events.KeyEvent;
     import org.eclipse.swt.events.KeyListener;
     import org.eclipse.swt.events.SelectionEvent;
     import org.eclipse.swt.events.SelectionListener;
     import org.eclipse.swt.layout.FormAttachment;
     import org.eclipse.swt.layout.FormData;
     import org.eclipse.swt.layout.FormLayout;
     import org.eclipse.swt.layout.GridData;
     import org.eclipse.swt.layout.GridLayout;
     import org.eclipse.swt.widgets.Button;
     import org.eclipse.swt.widgets.Combo;
     import org.eclipse.swt.widgets.Composite;
     import org.eclipse.swt.widgets.Control;
     import org.eclipse.swt.widgets.Display;
     import org.eclipse.swt.widgets.Event;
     import org.eclipse.swt.widgets.Label;
     import org.eclipse.swt.widgets.Listener;
     import org.eclipse.swt.widgets.Text;
     import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
     import org.txm.chartsengine.r.core.themes.DefaultTheme;
     import org.txm.chartsengine.rcp.editors.ChartEditorPart;
     import org.txm.core.messages.TXMCoreMessages;
     import org.txm.core.results.Parameter;
     import org.txm.progression.core.functions.Progression;
     import org.txm.progression.core.preferences.ProgressionPreferences;
     import org.txm.progression.rcp.messages.ProgressionUIMessages;
     import org.txm.rcp.IImageKeys;
     import org.txm.rcp.RCPMessages;
     import org.txm.rcp.StatusLine;
     import org.txm.rcp.editors.TXMEditorPart;
     import org.txm.rcp.editors.listeners.ComputeKeyListener;
     import org.txm.rcp.editors.listeners.ComputeSelectionListener;
     import org.txm.rcp.swt.widget.AssistedQueryWidget;
     import org.txm.rcp.swt.widget.StructuralUnitsGroup;
     import org.txm.searchengine.cqp.corpus.Corpus;
     import org.txm.searchengine.cqp.corpus.StructuralUnit;
     import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
     import org.txm.searchengine.cqp.corpus.query.Query;
     import org.txm.utils.logger.Log;
-...
     	/** The query widgets. */
     	protected List<QueryField> queryWidgets = new ArrayList<QueryField>();
     	/** The queries. */
     	List<Query> queries;
     	/** The corpus. */
     	private Corpus corpus;
     	/** The selected structural unit. */
     	private StructuralUnit selectedStructuralUnit;
     	/** The selected structural unit property. */
     	private StructuralUnitProperty selectedStructuralUnitProperty;
     	/** The regexproperty value. */
     	private String regexPropertyValue;
     	/** The graphtype. */
     	private boolean cumulative = true;
     	/** The monostyle. */
     	private boolean monostyle = true;
     	/** The linewidth. */
     	private int lineWidth = 2;
     	/** The structural units combo. */
     	Combo structuralUnitsCombo;
     	/** The structural units. */
     	List<StructuralUnit> structuralUnits;
     	/** The structural units properties. */
     	List<StructuralUnitProperty> structuralUnitsProperties;
     	/** The property combo. */
     	private Combo propertyCombo;
     	/** The regex value. */
     	private Text regexValue;
     	/** The focus composite. */
     	Composite queriesFocusComposite;
-...
     	/** The cumu button. */
     	Button cumuButton;
     	/** The repeat button. */
     	Button repeatButton;
     	/** The style button. */
     	Button styleButton;
     	/** The colors. */
     	String[] colors = DefaultTheme.colors;
-...
     	private Button densityButton;
     	/**
     	 * Queries.
     	 */
     	@Parameter(key=ProgressionPreferences.QUERIES)
     	protected List<Query> queries;
     	/**
     	 * Structural unit.
     	 */
     	@Parameter(key=ProgressionPreferences.STRUCTURAL_UNIT)
     	protected ComboViewer structuralUnitsComboViewer;
     	/**
     	 * Structural unit property.
     	 */
     	@Parameter(key=ProgressionPreferences.STRUCTURAL_UNIT_PROPERTY)
     	protected ComboViewer structuralUnitPropertiesComboViewer;
     	/**
     	 * Property REGEX.
     	 */
     	@Parameter(key=ProgressionPreferences.PROPERTY_REGEX)
     	protected Text propertyRegex;
     	/**
     	 * Mono style. Same lines styles.
     	 */
     	@Parameter(key=ChartsEnginePreferences.MULTIPLE_LINE_STROKES)
     	protected Button multipleLineStrokes;
     	/**
     	 * Repeats or not the same value when displaying the section markers.
     	 */
     	@Parameter(key=ProgressionPreferences.REPEAT_SAME_VALUES)
     	protected Button repeatSameValues;
     	@Override
     	public void _createPartControl(Composite parent) {
     		super._createPartControl(parent);
     		//super._createPartControl(parent);
     		// FIXME: tests parameters composite extension
-...
     		try {
     			monostyle = this.getBooleanParameterValue(ProgressionPreferences.CHART_MONO_STYLE);
     			cumulative = this.getBooleanParameterValue(ProgressionPreferences.CHART_CUMULATIVE);
     			// System.out.println(parent.getLayout());
-...
     			bandeField.setText("" + this.getResultData().getBandeMultiplier()); //$NON-NLS-1$
     			bandeField.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1));
     			// Structural units
     			//			Group displayParam = new Group(paramPanel, SWT.BORDER);
     			//			displayParam.setText(ProgressionUIMessages.ProgressionDialog_13);
     			//			displayParam.setLayout(new GridLayout(3, true));
     			//			displayParam.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 3, 1));
     			// Structural units and properties combo viewers
     			StructuralUnitsGroup structuration = new StructuralUnitsGroup(this, true, this.getResultData().getStructuralUnit(), this.getResultData().getStructuralUnitProperty(), paramPanel, SWT.NONE);
     			// Structural Unit
     			structuralUnitsComboViewer = structuration.getStructuralUnitsComboViewer();
     			// Structural Unit Property
     			structuralUnitPropertiesComboViewer = structuration.getStructuralUnitPropertiesComboViewer();
     			Label structLabel = new Label(paramPanel, SWT.NONE);
     			structLabel.setText(ProgressionUIMessages.ProgressionDialog_4);
     			structLabel.setAlignment(SWT.CENTER);
     			structuralUnitsCombo = new Combo(paramPanel, SWT.READ_ONLY);
     			structuralUnitsCombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1));
     			structuralUnitsCombo.addSelectionListener(new SelectionListener() {
     				@Override
     				public void widgetDefaultSelected(SelectionEvent e) {
+    				}
     				@Override
     				public void widgetSelected(SelectionEvent event) {
     					getSite().getShell().getDisplay().syncExec(new Runnable() {
     						@Override
     						public void run() {
     							StructuralUnit su = null;
     							if(structuralUnitsCombo.getSelectionIndex() != 0)	{
     								su = structuralUnits.get(structuralUnitsCombo.getSelectionIndex() - 1);
+    							}
     							// skip if no change
     							if(su == getResultData().getStructure())	{
     								return;
+    							}
     							reloadSUProperties();
     							getResultData().setStructuralUnit(su);
     							compute(true);
+    						}
     					});
+    				}
     			});
     			int selectedSUIndex = 0;
     			// get
     			try {
     				structuralUnitsCombo.add("    "); //$NON-NLS-1$
     				structuralUnits = this.getResultData().getCorpus().getOrderedStructuralUnits();
     				for(int i = 0; i < structuralUnits.size(); i++) {
     					structuralUnitsCombo.add(structuralUnits.get(i).getName());
     					if(getResultData().getStructure() == structuralUnits.get(i))	{
     						selectedSUIndex = (i + 1);
+    					}
+    				}
     			} catch (Exception e) {
     				Log.severe(RCPMessages.ERROR + Log.toString(e));
     				e.printStackTrace();
+    			}
     			structuralUnitsCombo.select(selectedSUIndex);
     			// Structural unit properties
     			Label propLabel = new Label(paramPanel, SWT.NONE);
     			propLabel.setText(TXMCoreMessages.PROPERTY_1);
     			propLabel.setAlignment(SWT.CENTER);
     			propertyCombo = new Combo(paramPanel, SWT.READ_ONLY);
     			propertyCombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1));
     			reloadSUProperties();
     			propertyCombo.addSelectionListener(new SelectionListener() {
     				@Override
     				public void widgetDefaultSelected(SelectionEvent e) {
+    				}
     				@Override
     				public void widgetSelected(SelectionEvent event) {
     					StructuralUnitProperty sup = null;
     					if(propertyCombo.getSelectionIndex() != 0)	{
     						sup = structuralUnitsProperties.get(propertyCombo.getSelectionIndex() - 1);
+    					}
     					//getResultData().setStructuralUnitProperty(sup);
     					compute(true);
+    				}
     			});
     			// property value field
     			Label regexLabel = new Label(paramPanel, SWT.NONE);
     			// property REGEX
     			Label regexLabel = new Label(structuration, SWT.NONE);
     			regexLabel.setText(ProgressionUIMessages.ProgressionDialog_7);
     			regexLabel.setAlignment(SWT.CENTER);
     			regexValue = new Text(paramPanel, SWT.SINGLE | SWT.BORDER);
     			regexValue.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1));
     			if(this.getResultData().getPropertyRegex() != null)	{
     				regexValue.setText(getResultData().getPropertyRegex());
+    			}
     			propertyRegex = new Text(structuration, SWT.SINGLE | SWT.BORDER);
     			// FIXME: layout
     			//propertyRegex.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true, 2, 1));
     			propertyRegex.addKeyListener(new ComputeKeyListener(this));
     			//spacer
     			styleButton = new Button(paramPanel, SWT.CHECK);
     			styleButton.setText(ProgressionUIMessages.ProgressionDialog_14);
     			styleButton.setSelection(monostyle);
     			// Repeat same values in part markers
     			repeatSameValues = new Button(structuration, SWT.CHECK);
     			repeatSameValues.setText(ProgressionUIMessages.ProgressionDialog_15);
     			repeatSameValues.addSelectionListener(new ComputeSelectionListener(this));
     			// Lines styles
     			multipleLineStrokes = new Button(paramPanel, SWT.CHECK);
     			multipleLineStrokes.setText(ProgressionUIMessages.ProgressionDialog_14);
     			multipleLineStrokes.addSelectionListener(new ComputeSelectionListener(this));
     			//Repeat options
     			repeatButton = new Button(paramPanel, SWT.CHECK);
     			repeatButton.setText(ProgressionUIMessages.ProgressionDialog_15);
     			repeatButton.setSelection(this.getResultData().isRepeatingValues());
     			repeatButton.addSelectionListener(new SelectionListener() {
     				@Override
     				public void widgetSelected(SelectionEvent e) {
     					//getResultData().setRepeatValues(repeatButton.getSelection());
     					compute(true);
+    				}
     				@Override
     				public void widgetDefaultSelected(SelectionEvent e) {
     					// TODO Auto-generated method stub
+    				}
     			});
     			// Queries
     			sc1 = new ScrolledComposite(mainPanel, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
     			glayout = new GridLayout(1, true);
-...
     			sc1.setContent(queriesFocusComposite);
     			// queries parameters
     			// FIXME: useless?
     //			Label focusLabel = new Label(queriesFocusComposite, SWT.NONE);
     //			focusLabel.setText(ProgressionUIMessages.ProgressionDialog_8);
     //			focusLabel.setAlignment(SWT.CENTER);
     			// add query button
     			Button plusButton = new Button(queriesFocusComposite, SWT.NONE);
     			plusButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER,
     					true, false));
     			plusButton.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
     			plusButton.setText(ProgressionUIMessages.ProgressionDialog_9);
     			plusButton.addListener(SWT.Selection, new Listener() {
-...
+    				}
     			});
     			// fill fields from result data
     			queries = this.getResultData().getQueries();
     			if (queries == null) {
     				addFocusQueryField();
+    			}
     			else {
     				for (Query q : queries) {
     					addFocusQueryField().setQuery(q.getQueryString());
+    				}
+    			}
     		} catch (Exception e) {
     			Log.printStackTrace(e);
+    		}
-...
+    	}
     	/**
+    	 *
     	 * @author mdecorde
+    	 *
     	 */
     	public class QueryField extends Composite {
     		protected AssistedQueryWidget focusTextBox;
     		protected TXMEditorPart editor;
     		/**
+    		 *
     		 * @param editor
     		 * @param parent
     		 * @param style
     		 */
     		public QueryField(Composite parent, int style) {
     			super(parent, style);
     			GridLayout glayout = new GridLayout(2, false);
     			glayout.marginBottom = glayout.marginTop = glayout.marginHeight = glayout.verticalSpacing = 0;
-...
     			focusTextBox.setFocus();
     			focusTextBox.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
     			focusTextBox.addKeyListener(new KeyListener() {
     				@Override
     				public void keyPressed(KeyEvent e) {
     					// System.out.println("key pressed : "+e.keyCode);
     					if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
     						updateResultFromEditor();
     						compute(false);
+    					}
+    				}
     			// listener
     			focusTextBox.addKeyListener(new ComputeKeyListener(ProgressionEditor.this));
     				@Override
     				public void keyReleased(KeyEvent e) {
+    				}
     			});
     			// delete query button
     			Button minusButton = new Button(this, SWT.NONE);
     			minusButton.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
-...
     			minusButton.addListener(SWT.Selection, new Listener() {
     				@Override
     				public void handleEvent(Event event) {
     					if (queryWidgets.size() > 0) {
     					if (queryWidgets.size() > 1) {
     						// System.out.println("remove field");
     						QueryField lastwidget = QueryField.this;
     						lastwidget.setSize(200, 30);
-...
+    		}
     		public void setQuery(String query) {
     			focusTextBox.setText(query);
+    		}
     		public Query getQuery() {
-...
+    	}
     	/**
     	 * Reloads the properties of the current selected structural unit.
     	 */
     	// FIXME: mutualize this method, its used for some other editors
     	private void reloadSUProperties() {
     		propertyCombo.removeAll();
     		propertyCombo.add("    "); //$NON-NLS-1$
     		int selectedSUPIndex = 0;
     		if (structuralUnitsCombo.getSelectionIndex() > 0) {
     			selectedStructuralUnit = structuralUnits.get(structuralUnitsCombo.getSelectionIndex() - 1);
     			structuralUnitsProperties = selectedStructuralUnit.getOrderedProperties();
     			for(int i = 0; i < structuralUnitsProperties.size(); i++) {
     				propertyCombo.add(structuralUnitsProperties.get(i).getName());
     				if(getResultData().getProperty() == structuralUnitsProperties.get(i))	{
     					selectedSUPIndex = (i + 1);
+    				}
+    			}
+    		}
     		if (propertyCombo.getItemCount() > 0) {
     			propertyCombo.select(selectedSUPIndex);
+    		}
+    	}
     	/**
     	 * Adds a query field.
+    	 *
     	 * @return the assisted query widget
     	 */
     	private QueryField addFocusQueryField(String text) {
     		QueryField queryField = new QueryField(queriesFocusComposite, SWT.NONE);
     		// do not add same query twice
     		for (int i = 0; i < queryWidgets.size(); i++) {
     			if(queryWidgets.get(i).getQuery().getQueryString().equals(text)
     					|| (queryWidgets.get(i).getQuery().getQueryString().equals("\"\"") && text.isEmpty()))	{
     				return null;
+    			}
+    		}
     		QueryField queryField = new QueryField(this.queriesFocusComposite, SWT.NONE);
     		queryField.setQuery(text);
     		GridData gridData = new GridData(GridData.FILL, GridData.FILL, true, false);
     		queryField.setLayoutData(gridData);
     		this.queriesFocusComposite.layout(true);
     		return queryField;
+    	}
-...
+    	}
     	@Override
     	public void updateEditorFromResult(boolean update) {
     		// create the queries fields
     		if (queries == null) {
     			addFocusQueryField();
+    		}
     		else {
     			for (Query q : queries) {
     				addFocusQueryField(q.getQueryString());
+    			}
+    		}
+    	}
     	@Override
     	public void updateResultFromEditor() {
     		Display.getDefault().syncExec(new Runnable() {
     			@Override
     			public void run() {
     //		Display.getDefault().syncExec(new Runnable() {
     //			@Override
     //			public void run() {
     				queries = new ArrayList<Query>();
     				for (QueryField wid : queryWidgets) {
-...
+    					}
+    				}
     				if (propertyCombo.getSelectionIndex() > 0) {
     					selectedStructuralUnitProperty = structuralUnitsProperties.get(propertyCombo.getSelectionIndex() - 1);
+    				}
     				else {
     					selectedStructuralUnitProperty = null;
+    				}
     				if (structuralUnitsCombo.getSelectionIndex() > 0) {
     					selectedStructuralUnit = structuralUnits.get(structuralUnitsCombo.getSelectionIndex() - 1);
+    				}
     				else {
     					selectedStructuralUnit = null;
     					selectedStructuralUnitProperty = null;// need a structuralunit
+    				}
     				try {
     					Pattern.compile(regexValue.getText());
     					regexPropertyValue = regexValue.getText();
     					if (regexPropertyValue.length() == 0) {
     						regexPropertyValue = null;
+    					}
     				} catch (PatternSyntaxException e) {
     					System.out.println(ProgressionUIMessages.ProgressionDialog_10 + e);
+    				}
     				cumulative = cumuButton.getSelection();
     				monostyle = styleButton.getSelection();
     				String smultibande = bandeField.getText();
     				float bandeMultiplier = 1.0f;
     				if (smultibande != null && smultibande.length() > 0) {
-...
     						bandeMultiplier = Float.parseFloat(smultibande);
     					} catch(Exception e) {
     						bandeMultiplier = 1.0f;
     						System.out.println(ProgressionUIMessages.ProgressionDialog_17+e);
     						StatusLine.error(ProgressionUIMessages.ProgressionDialog_17+e);
     						System.out.println(ProgressionUIMessages.ProgressionDialog_17 + e);
     						StatusLine.error(ProgressionUIMessages.ProgressionDialog_17 + e);
+    					}
+    				}
     				else	{
     					bandeMultiplier = 1.0f;
+    				}
     				//getResultData().setParameters(queries, selectedStructuralUnit, selectedStructuralUnitProperty, regexPropertyValue, cumulative, lineWidth, repeatButton.getSelection(), bandeMultiplier);
     //			}
     //		});
     				((Progression)getResultData()).setParameters(queries, selectedStructuralUnit, selectedStructuralUnitProperty, regexPropertyValue, cumulative, lineWidth, repeatButton.getSelection(), bandeMultiplier);
+    			}
     		});
+    	}
+    }

     		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(this.getFieldEditorParent());
     		this.addField(new BooleanFieldEditor(ProgressionPreferences.CHART_CUMULATIVE, ProgressionUIMessages.ProgressionPreferencePage_3, chartsTab));
     		this.addField(new BooleanFieldEditor(ProgressionPreferences.CHART_MONO_STYLE, ProgressionUIMessages.ProgressionPreferencePage_5, chartsTab));
     		this.addField(new BooleanFieldEditor(ProgressionPreferences.REPEAT_VALUES, ProgressionUIMessages.ProgressionPreferencePage_6, chartsTab));
     		this.addField(new BooleanFieldEditor(ProgressionPreferences.REPEAT_SAME_VALUES, ProgressionUIMessages.ProgressionPreferencePage_6, chartsTab));
     		DoubleFieldEditor bandemultiplierfield = new DoubleFieldEditor(ProgressionPreferences.BANDE_MULTIPLIER, ProgressionUIMessages.ProgressionPreferencePage_7, chartsTab);
     		this.addField(bandemultiplierfield);

     			Index index = new Index(corpus);
     			index.setParameters(query, properties, null, null, null, null);
     			index.compute(false);
     			index.compute();
     			index.getAllLines();
     			if (sortBy != null) {
-...
     			Index index = new Index(partition);
     			index.setParameters(query, properties, null, null, null, null);
     			index.compute(false);
     			index.compute();
     			index.getAllLines();
     			if (sortBy != null) {

+    	}
     	@Override
     	protected boolean _compute(boolean update) throws Exception {
     	protected boolean _compute() throws Exception {
     		lines.clear();
     		counts.clear();
     		partnames.clear();

tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java (revision 615)
25	25
26	26	@Override
27	27	public void _createPartControl(Composite parent) {
28		super._createPartControl(parent);
29	28
30	29	// Group bars by lines
31	30	final ToolItem groupBarsByLines = new ToolItem(this.getToolBar(), SWT.CHECK);

     	public void loadChart(Object data) {
     		this.getChartPanel().setChart((JFreeChart) data);
     		// FIXME: for updating chart. The problem here is the theme is applied twice? one time at the creation and onn time at the update?
     		((JFCChartsEngine) this.chartEditor.getChartsEngine()).getJFCTheme().applyThemeToChart(this.chartEditor.getResultData());
     		// FIXME: for updating chart. The problem here is the theme is applied twice? one time at the creation and one time at the update?
     		//((JFCChartsEngine) this.chartEditor.getChartsEngine()).getJFCTheme().applyThemeToChart(this.chartEditor.getResultData());
     		// FIXME: tests, restore the zoom from local node
     		//this.zoom(x, y, zoomIn);

+    	}
     	@Override
     	protected boolean _compute(boolean update) throws Exception {
     	protected boolean _compute() throws Exception {
     		if (useFactoMineR) {
     			r_ca = new FactoMineRCA(this.getLexicalTable().getData());
     		if (this.useFactoMineR) {
     			this.r_ca = new FactoMineRCA(this.getLexicalTable().getData());
+    		}
     		else {
     			r_ca = new org.txm.ca.core.statsengine.r.functions.CA(this.getLexicalTable().getData());
     			this.r_ca = new org.txm.ca.core.statsengine.r.functions.CA(this.getLexicalTable().getData());
+    		}
     		r_ca.compute();
     		this.r_ca.compute();
     		 // in case the lexical table changes
     		this.getColNames();
-...
     		return sum;
+    	}
     	/**
     	 * Use this function to start CA process from a LexicalTable.
+    	 *
     	 * @throws StatException the stat exception
     	 * @throws CqiClientException the cqi client exception
     	 */
     	public void processFromTable() throws Exception, StatException, CqiClientException {
     		this.compute(false);
+    	}
     	/**
     	 * Exports CA R data to a file

     	@Override
     	protected boolean _compute(boolean update) throws Exception {
     	protected boolean _compute() throws Exception {
     		// nothing to do
     		return true;
+    	}

     import org.txm.chartsengine.rcp.editors.ChartEditorPart;
     import org.txm.core.preferences.TXMPreferences;
     import org.txm.lexicaltable.core.functions.LexicalTable;
     import org.txm.lexicaltable.core.functions.LexicalTableFactory;
     import org.txm.lexicaltable.core.functions.___LexicalTableFactory;
     import org.txm.lexicaltable.rcp.editors.LexicalTableDialog;
     import org.txm.rcp.handlers.BaseAbstractHandler;
     import org.txm.rcp.views.corpora.CorporaView;

     	@Override
     	public void _createPartControl(Composite parent) {
     		super._createPartControl(parent);
     		// Extend the chart editor tool bar
     		ToolItem separator = new ToolItem(this.topToolBar, SWT.SEPARATOR);
-...
     				try {
     					this.acquireSemaphore();
     					getResultData().compute(false, this);
     					getResultData().compute(this);
     					this.releaseSemaphore();
     					if(!update)	{

                 name="ParametersView"
                 restorable="true">
           </view>
           <view
                 category="org.txm.rcp"
                 class="org.txm.rcp.views.cmdparameters.TXMResultDebugView"
                 icon="icons/functions/Properties.png"
                 id="org.txm.rcp.views.cmdparameters.TXMResultDebugView"
                 name="TXMResultDebugView"
                 restorable="true">
           </view>
        </extension>
        <extension
              point="org.eclipse.core.runtime.adapters">

Laboratoire ICAR » Plateforme TXM

Révision 615