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

     import org.txm.concordance.core.functions.comparators.LineComparator;
     import org.txm.concordance.core.messages.ConcordanceMessages;
     import org.txm.concordance.core.preferences.ConcordancePreferences;
     import org.txm.core.results.Parameter;
     import org.txm.core.results.TXMParameters;
     import org.txm.core.results.TXMResult;
     import org.txm.searchengine.cqp.AbstractCqiClient;
-...
     	protected List<Line> lines;
     	/** The n lines. */
     	protected int nLines;
     	/** The keyword analysis properties */
     	@Parameter
     	protected List<Property> pAnalysisKeywordProperties;
     	/** The analysis properties */
     	@Parameter
     	protected List<Property> pAnalysisLeftProperties;
     	/** The ReferncePattern sort properties	 */
     	@Parameter
     	protected ReferencePattern pAnalysisRefPattern;
     	/** The right c analysis property. */
     	@Parameter
     	protected List<Property> pAnalysisRightProperties;
     	/** used to limit context to the matches of the CQL limit query	 */
     	@Parameter
     	protected String pLimitCQL;
     	/** The left context size. */
     	@Parameter
     	protected Integer pLeftContextSize;
     	/** The query. */
     	@Parameter
     	protected Query pQuery;
     	/** The right context size. */
     	@Parameter
     	protected Integer pRightContextSize;
     	/**	 The top line index shown and the number of lines to show per page */
     	@Parameter
     	protected Integer pTopIndex, pNLinesPerPage;
     	/** The keyword view properties. */
     	@Parameter
     	protected List<Property> pViewKeywordProperties;
     	/** The left c view properties. */
     	@Parameter
     	protected List<Property> pViewLeftProperties;
     	/** The reference pattern. */
     	@Parameter
     	protected ReferencePattern pViewRefPattern;
     	/** The right c view properties. */
     	@Parameter
     	protected List<Property> pViewRightProperties;
     	//	/** The view properties. */
     	//	private List<Property> pViewKeywordProperties; // contains all the view properties
-...
     	public void setCQLSeparator(String cql_limit) {
     		this.pLimitCQL = cql_limit;
     		updateDirty(pLimitCQL, cql_limit);
     		//updateDirty(pLimitCQL, cql_limit);
+    	}
     	/**
-...
     	 *            the new analysis property
     	 */
     	public void setKeywordAnalysisProperties(List<Property> selectedKeywordSortProperty) {
     		//updateDirty(pAnalysisKeywordProperties, selectedKeywordSortProperty);
     		this.pAnalysisKeywordProperties = selectedKeywordSortProperty;
     		updateDirty(pAnalysisKeywordProperties, selectedKeywordSortProperty);
     		resetLines();
+    	}
-...
     	 *            the new analysis property
     	 */
     	public void setLeftAnalysisProperties(List<Property> selectedLeftSortProperty) {
     		//updateDirty(pAnalysisLeftProperties, selectedLeftSortProperty);
     		this.pAnalysisLeftProperties = selectedLeftSortProperty;
     		updateDirty(pAnalysisLeftProperties, selectedLeftSortProperty);
     		resetLines();
+    	}
-...
     	 * @param size the new context size
     	 */
     	public void setLeftContextSize(int size) {
     		//updateDirty(pLeftContextSize, size);
     		this.pLeftContextSize = size;
     		updateDirty(pLeftContextSize, size);
     		resetLines();
+    	}
-...
     	 *            the new reference Pattern
     	 */
     	public void setRefAnalysePattern(ReferencePattern referencePattern) {
     		//updateDirty(pAnalysisRefPattern, referencePattern);
     		this.pAnalysisRefPattern = referencePattern;
     		updateDirty(pAnalysisRefPattern, referencePattern);
     		resetLines();
+    	}
-...
     	 *            the new reference Pattern
     	 */
     	public void setRefViewPattern(ReferencePattern referencePattern) {
     		//updateDirty(pViewRefPattern, referencePattern);
     		this.pViewRefPattern = referencePattern;
     		updateDirty(pViewRefPattern, referencePattern);
     		resetLines();
+    	}
-...
     	 *            the new analysis property
     	 */
     	public void setRightAnalysisProperties(List<Property> selectedRightSortProperty) {
     		//updateDirty(pAnalysisRightProperties, selectedRightSortProperty);
     		this.pAnalysisRightProperties = selectedRightSortProperty;
     		updateDirty(pAnalysisRightProperties, selectedRightSortProperty);
     		resetLines();
+    	}
-...
     	 *            the new context size
     	 */
     	public void setRightContextSize(int size) {
     		//updateDirty(pRightContextSize, size);
     		this.pRightContextSize = size;
     		updateDirty(pRightContextSize, size);
     		resetLines();
+    	}
-...
+    	}
     	public void setLeftViewProperties(List<Property> selectedViewProperties) {
     		//updateDirty(pViewLeftProperties, selectedViewProperties);
     		this.pViewLeftProperties = selectedViewProperties;
     		updateDirty(pViewLeftProperties, selectedViewProperties);
+    	}
     	public void setRightViewProperties(List<Property> selectedViewProperties) {
     		//updateDirty(pViewRightProperties, selectedViewProperties);
     		this.pViewRightProperties = selectedViewProperties;
     		updateDirty(pViewRightProperties, selectedViewProperties);
+    	}
     	public void setKeywordViewProperties(List<Property> selectedViewProperties) {
     		//updateDirty(pViewKeywordProperties, selectedViewProperties);
     		this.pViewKeywordProperties = selectedViewProperties;
     		updateDirty(pViewKeywordProperties, selectedViewProperties);
+    	}
     	public List<Property> getAvailableLeftSortProperties() {
-...
     	 * @param query the query to set
     	 */
     	public void setQuery(Query query) {
     		//updateDirty(pQuery, query);
     		this.pQuery = query;
     		updateDirty(pQuery, query);
+    	}
     	public void setTopIndex(int i) {

     	@Override
     	public void doSave(IProgressMonitor monitor) {
     		// TODO Auto-generated method stub
     //		if (!getResultData().saveParameters()) { // ?
     //
     //		}
+    	}
     	@Override
-...
     	/**
     	 * Gets the parameters compiste.
     	 * Gets the parameters composite.
     	 * @return the composite that contains the TXMEditorToolBar parameters panels
     	 */
     	public Composite getParametersGroupsComposite() {
-...
+    		}
     		viewer.getControl().setRedraw(true);
+    	}
+    }

+    		}
     		TXMEditorPart editor = (TXMEditorPart)page;
     		editor.getResultData().setDirty(); //TODO: MD: I had to add this to recompute the concordance when the query field has been modified
     		//editor.getResultData().setDirty(); //TODO: MD: I had to add this to recompute the concordance when the query field has been modified
     		editor.updateResultFromEditor();
     		editor.updateResultFromEditor();
     		editor.compute(true);
     		return null;

tmp/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/vlcplayer/VLCPlayerEditor.java (revision 548)
78	78	public boolean isResultUsingParent(TXMResult parent) {
79	79	return false;
80	80	}
	81
	82	@Override
	83	public void updateResultFromEditor() {
	84	// nothing to do
	85	}
81	86	}

tmp/org.txm.synopticeditor.rcp/src/org/txm/rcp/synoptic/editor/SynopticEditionEditor.java (revision 548)
852	852	editionsChooser.setText(StringUtils.join(editionNames, " \| ")); //$NON-NLS-1$
853	853	page_label.setText(""); //$NON-NLS-1$
854	854	}
	855
	856	@Override
	857	public void updateResultFromEditor() {
	858	// nothing to do
	859	}
855	860	}

     package org.txm.core.results;
     import static java.lang.annotation.ElementType.FIELD;
     import static java.lang.annotation.ElementType.METHOD;
     import static java.lang.annotation.ElementType.PARAMETER;
     import static java.lang.annotation.RetentionPolicy.RUNTIME;
     import java.lang.annotation.Retention;
     import java.lang.annotation.Target;
     /**
      * An annotation to identify The TXMResult parameters
+     *
      * @author mdecorde
+     *
      */
     @Retention(RUNTIME)
     @Target({FIELD,METHOD,PARAMETER})
     public @interface Parameter {
+    }

     import java.io.File;
     import java.io.IOException;
     import java.lang.reflect.Field;
     import java.text.DateFormat;
     import java.text.SimpleDateFormat;
     import java.util.ArrayList;
     import java.util.Date;
     import java.util.HashMap;
     import java.util.UUID;
     import java.util.concurrent.Semaphore;
     import java.util.regex.Pattern;
-...
     	/** Editor can use this to test if the result need to be saved */
     	protected boolean hasBeenComputedOnce = false;
     	public boolean getHasBeenComputedOnce() { return hasBeenComputedOnce;}
     	/**
     	 * The weight, essentially used for sorting purpose.
     	 */
-...
     		this.preferencesNodeQualifier = FrameworkUtil.getBundle(getClass()).getSymbolicName();
     		this.constructorCalled = true; // if not set the compute method will
     										// always return false
     		// always return false
     		// FIXME: Debug
     		// System.out.println("TXMResult.TXMResult(): default preferences node qualifier = "
     		// + this.preferencesNodeQualifier + ", class = " + getClass());
-...
     		return this.children.size() > 0;
+    	}
     	protected HashMap<String, Object> lastComputeParameters = new HashMap<String, Object>();
     	protected void updateLastComputeParameters() throws Exception {
     		Field[] fields = this.getClass().getDeclaredFields();
     		for (Field f : fields) {
     			String name = f.getName();
     			Parameter annotations = f.getAnnotation(Parameter.class);
     			if (annotations == null) continue;
     			f.setAccessible(true);
     			lastComputeParameters.put(name, f.get(this));
+    		}
+    	}
     	public HashMap<String, Object> getLastComputeParameters() {
     		return lastComputeParameters;
+    	}
     	/**
     	 * Update the dirty states by comparing TXMResult @Parameter with previously used parameters in the compute() method.
+    	 *
     	 * To work correctly the equals method of the TXMResult parameters must be correctly implemented.
+    	 *
     	 * The method is final and don't need to be re-implemented. To ignore this method, don't use the @Parameter annotations
+    	 *
     	 * Implement isDirty if you need more test
+    	 *
     	 * @return
     	 * @throws IllegalAccessException
     	 * @throws IllegalArgumentException
     	 */
     	public final boolean isDirtyFromHistory() throws Exception {
     		Class clazz = this.getClass();
     		Field[] fields = clazz.getDeclaredFields();
     		for (Field f : fields) {
     			String name = f.getName();
     			Parameter annotations = f.getAnnotation(Parameter.class);
     			if (annotations == null) continue;
     			f.setAccessible(true); // not to set accessible to test the field values
     			Object previousValue = lastComputeParameters.get(name);
     			Object newValue = f.get(this);
     			updateDirty(previousValue, newValue);
     			if (dirty) return dirty; // no need to go further
+    		}
     		return dirty;
+    	}
     	/**
     	 * Gets the dirty states.
+    	 *
     	 * @return
-...
     	 * @param newParameter may be null
     	 */
     	protected void updateDirty(Object oldParameter, Object newParameter) {
     		this.dirty = oldParameter == null || oldParameter.equals(newParameter);
     		if (oldParameter == null || !oldParameter.equals(newParameter)) {
     			Log.info("set dirty true : old="+oldParameter+" new="+newParameter);
     			this.dirty = true;
+    		}
+    	}
     	/**
+    	 *
     	 * @param parent
-...
     		return null;
+    	}
     	/**
     	 * Gets the children of all the branch of the specified node in a flat list.
+    	 *
     	 * @return
     	 */
     	synchronized protected ArrayList<TXMResult> getDeepChildren(TXMResult parent) {
     		ArrayList<TXMResult> results = new ArrayList<TXMResult>();
     		for (int i = 0; i < parent.getResults().size(); i++) {
     			results.add(parent.getResults().get(i));
-...
     			if(parent.getClass().getSimpleName().equals(classSimpleName)) {
     				node = parent;
+    			}
     			parent = parent.getParent();
     		} while (parent != null && node == null);
-...
     	synchronized public TXMResult getParentMainCorpus() {
     		return this.getFirstParent("MainCorpus"); //$NON-NLS-1$
+    	}
     	/**
     	 * Returns the first parent object that is a SubCorpus, a Corpus or a MainCorpus.
-...
     	 * @return
     	 */
     	synchronized public TXMResult getFirstParentCorpus() {
     		// FIXME: need to validate/prove this method
     		System.err.println("TXMResult.getFirstCorpusParent(): need to validate/prove this method.");
     		TXMResult corpus = this.getFirstParent("Subcorpus"); //$NON-NLS-1$
     		if(corpus == null)	{
     			corpus = this.getFirstParent("Corpus"); //$NON-NLS-1$
-...
     		return corpus;
+    	}
     	/**
     	 * Gets the sibling nodes of this node result.
     	 */
-...
+    	}
     	public static final Pattern filenamePattern = Pattern.compile("[^a-zA-Z0-9\\._-]+"); //$NON-NLS-1$
     	public static final String UNDERSCORE = "_";
     	/**
     	 * Gets a string representing the result and that can be used as a file
     	 * name.
-...
     	// FIXME: to discuss and/or to move in export layer
     	public String getValidFileName() {
     		try {
     			return filenamePattern.matcher(this.getName()).replaceAll("_"); //$NON-NLS-1$
     			return filenamePattern.matcher(this.getName()).replaceAll(UNDERSCORE); //$NON-NLS-1$
     		} catch (Exception e) {
+    		}
     		return "";
-...
     		// FIXME: Debug
     		System.err.println("TXMResult.compute(): computing result of type " + this.getClass() + "...");
     		if (!this.isDirtyFromHistory()) {
     			// FIXME: Debug
     			System.err.println("TXMResult.compute(): result parameters have not changed computing skipped.");
     			return true;
+    		}
     		if (!this.isDirty()) {
     			// FIXME: Debug
     			System.err.println("TXMResult.compute(): result is not dirty, computing skipped.");
     			return true;
+    		}
     		if (!hasBeenConstructorCalled()) {
     			return false;
+    		}
-...
+    		}
     		if (!_compute(update)) {
     			// FIXME: Debug
     			System.err.println("TXMResult.compute(): computing failed.");
     			return false;
+    		}
     		updateLastComputeParameters(); // store last used parameters
     		if (!saveParameters()) {
     			System.out.println("Warning: "+this.getName()+" parameters are not saved.");
+    		}
-...
     	 * Copies the parameters from the local preference node if exists. Also fills the non existent parameters with the command default preferences.
     	 */
     	//public abstract void loadParameters();
     	/**
+    	 *
     	 * @return the array of extensions to show in the FileDialog SWT widget
-...
     			monitor.subTask(name);
+    		}
+    	}
+    }

     			public void keyPressed(KeyEvent e) {
     				// System.out.println("key pressed : "+e.keyCode);
     				if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
     					updateResultFromEditor();
     					compute(true);
     					//updateResultFromEditor();
     					concordance.setQuery(queryWidget.getQuery());
     					//compute(true);
+    				}
+    			}

Laboratoire ICAR » Plateforme TXM

Revision 548