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

     	 * @return
     	 */
     	//FIXME: does not work, need to test furthermore
     	//	public static Object get(TXMCommandParameters commandParameters, TXMResult result, String nodeQualifier, String key)	{
     	//	public static Object get(TXMResultParameters commandParameters, TXMResult result, String nodeQualifier, String key)	{
     	//
     	//
     	//		if(commandParameters != null && commandParameters.get(key) != null)	{

     package org.txm.core.results;
     import java.io.File;
     import java.io.IOException;
     import java.text.DateFormat;
     import java.text.SimpleDateFormat;
     import java.util.ArrayList;
     import java.util.Date;
     import java.util.UUID;
     import java.util.concurrent.Semaphore;
     import org.eclipse.core.runtime.IProgressMonitor;
     import org.osgi.framework.FrameworkUtil;
     import org.osgi.service.prefs.BackingStoreException;
     import org.txm.core.preferences.TXMPreferences;
     import org.txm.utils.logger.Log;
     /**
      * Root class of all TXM results.
-...
+     *
      */
     //FIXME: At this moment, an empty list is created for children, to not return null when calling getChildren(), see if that's what we want
     public abstract class TXMResult implements Cloneable {
     public abstract class TXMResult implements Cloneable, IProgressMonitor {
     	/**
     	 * Unique ID of the object built with : class + date + number
-...
     	protected String preferencesNodeQualifier;
     	/**
     	 * Creates a new TXMResult with no parent.
     	 */
     	public TXMResult() {
     		this(null);
+    	}
     	/**
     	 * Creates a new TXMResult, child of the specified parent.
     	 * @param parent
     	 */
-...
     		this.preferencesNodeQualifier = FrameworkUtil.getBundle(getClass()).getSymbolicName();
     		this.parameters = parameters;
     		this.constructorCalled = true; // if not set the compute method will always return false
     		//FIXME: Debug
     		//System.out.println("TXMResult.TXMResult(): default preferences node qualifier = " + this.preferencesNodeQualifier + ", class = " + getClass());
+    	}
-...
     		return TXMPreferences.getString(key, this.parameters, this, this.preferencesNodeQualifier);
+    	}
     	public void saveParameters() {
     		TXMPreferences.putLocalParameters(this, this.parameters);
     	/**
     	 * Read the parameter stored in the Java class membres : the pXXXXX named members
+    	 *
     	 * Commands must define this method to persist their parameters
+    	 *
     	 * just return 'true' if you don't want to bother with this
     	 * @return
     	 */
     	public boolean saveParameters() {
     		return true; // true means the compute method will not fail
+    	}
     	/**
-...
     	public String getSimpleDetails() {
     		return this.getDetails().replace("\n", "  ");
+    	}
     	/**
     	 * if set, allows the command to notify its progress
     	 */
     	protected IProgressMonitor monitor;
     	Semaphore progressSemaphore = new Semaphore(1);
     	/**
     	 * This variable ensure the TXMResult class constructor has been called
     	 */
     	private boolean constructorCalled;
     	public void acquireSemaphore() {
     		try {
     			this.progressSemaphore.acquire();
     		} catch (InterruptedException e) {
     			Log.printStackTrace(e);
+    		}
+    	}
     	/**
     	 * Computes the result according to specified command parameters.
+    	 *
     	 * @param parameters
     	 * @return
     	 */
     	public boolean compute() throws Exception {
     		return this.compute(null);
+    	}
     	/**
     	 * Computes the result according to stored command parameters.
+    	 *
     	 * @param watcher
     	 * @return
     	 * @throws Exception
     	 * @throws InvalidCqpIdException
     	 * @throws CqiServerError
     	 * @throws CqiClientException
     	 * @throws IOException
     	 */
     	public boolean compute(IProgressMonitor monitor) throws Exception {
     		return hasBeenConstructorCalled() && setCurrentMonitor(monitor) && validateParameters() &&  _compute() && saveParameters();
+    	}
     	private boolean hasBeenConstructorCalled() {
     		// TODO Auto-generated method stub
     		return constructorCalled;
+    	}
     	public abstract boolean _compute() throws Exception;
     // //removed for now, waiting to see if used
     //	/**
     //	 * Computes the result according to specified command parameters.
     //	 * @param watcher
     //	 * @param parameters
     //	 * @return
     //	 */
     //	public boolean compute(IProgressMonitor watcher, TXMParameters parameters) throws Exception {
     //		this.parameters = parameters;
     //		return this.compute(watcher);
     //	}
     	/**
+    	 *
     	 * @return the array of extensions to show in the FileDialog SWT widget
     	 */
     	@Deprecated
     	//FIXME: should be moved in an exporter extension
     	public String[] getExportTXTExtensions() {
     		return new String[]{"*.csv"};
+    	}
     	/**
+    	 *
     	 * @return true if the monitor has been canceled by the user
     	 */
     	public boolean isCanceled() {
     		if (monitor != null) {
     			return monitor.isCanceled();
+    		}
     		return false;
+    	}
     	/**
+    	 *
     	 * @return the parent Object that contains this result
     	 */
     	@Deprecated
     	// FIXME: to remove when TXMResult2 will be fully implemented
     	//public abstract HasResults getHasResultsParent();
     	public boolean tryAcquireSemaphore() {
     		return this.progressSemaphore.tryAcquire();
+    	}
     	public void releaseSemaphore() {
     		this.progressSemaphore.release();
+    	}
     	/**
     	 * You must set the current monitor to be available to manage the process progress
     	 * @param monitor can be null
     	 */
     	public boolean setCurrentMonitor(IProgressMonitor monitor) {
     		if (monitor == null) return false;
     		if (monitor.isCanceled()) return false;
     		this.monitor = monitor;
     		return true;
+    	}
     	//public abstract boolean toTxt(File file, String encoding) throws Exception;
     	@Deprecated
     	//FIXME: should be moved in an exporter extension
     	public abstract boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception;
     	/**
     	 * increment the process
     	 * @param amount of work
     	 */
     	public void worked(int amount) {
     		if (monitor != null) {
     			//System.out.println("worked "+amount);
     			monitor.worked(amount);
+    		}
+    	}
     	/**
     	 * increment the progress and show a message
+    	 *
     	 * @param amount
     	 * @param message
     	 */
     	public void worked(int amount, String message) {
     		if (monitor != null) {
     			monitor.worked(amount);
     			monitor.subTask(message);
+    		}
+    	}
     	@Override
     	public void beginTask(String name, int totalWork) {
     		if (monitor != null) monitor.beginTask(name, totalWork);
+    	}
     	@Override
     	public void done() {
     		if (monitor != null) monitor.done();
+    	}
     	@Override
     	public void internalWorked(double work) {
     		if (monitor != null) monitor.internalWorked(work);
+    	}
     	@Override
     	public void setCanceled(boolean value) {
     		if (monitor != null) monitor.setCanceled(value);
+    	}
     	@Override
     	public void setTaskName(String name) {
     		if (monitor != null) monitor.setTaskName(name);
+    	}
     	@Override
     	public void subTask(String name) {
     		if (monitor != null) monitor.subTask(name);
+    	}
+    }

tmp/org.txm.core/src/java/org/txm/core/results/TXMParameters.java (revision 526)
27	27	while (it.hasNext()) {
28	28	Object key = it.next();
29	29	Object value = this.get(key);
30		System.out.println("TXMCommandParameters.dump(): key = " + key + " / value = " + value);
	30	System.out.println("TXMResultParameters.dump(): key = " + key + " / value = " + value);
31	31	}
32	32	}
33	33	}

     	 * @param c the c
     	 */
     	public Corpus(Base base, Element c) {
     		if(base != null && c != null)
+    		{
     		super(base);
     		if(base != null && c != null) {
     			this.base = base;
     			this.setPath(base.getPath() + getName());
     			setSelfElement(c);

     	 * @param page the page
     	 */
     	public Page(Edition edition, Element page) {
     		super(edition);
     		this.setPath(edition.getPath() + getName());
     		setSelfElement(page);
     		this.edition = edition;
-...
     		this.getSelfElement().setAttribute("id", name); //$NON-NLS-1$
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#getChildren()
     	 */
     	public List<TxmObject> getChildren() {
     		List<TxmObject> rez = new ArrayList<TxmObject>();
     		return rez;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#removeChildren(org.txm.objects.TxmObject)
     	 */
     	public TxmObject removeChildren(TxmObject o) {
     		return null;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#hasChildren(org.txm.objects.TxmObject)
     	 */
     	public boolean hasChildren(TxmObject o) {
     		return false;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#getParent()
     	 */
     	@Override
     	public TxmObject getParent() {
     		return getEdition();
+    	}
     	@Override
     	public boolean save() {
     		// TODO Auto-generated method stub
     		return false;
-...
     	public String toString() {
     		return "Page [name="+name+", htmlfile="+htmlfile +", firstWordId="+firstWordId+"]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+    	}
     	@Override
     	public String getSimpleName() {
     		return getName();
+    	}
     	@Override
     	public String getDetails() {
     		return getName();
+    	}
     	@Override
     	public void clean() {
     		// TODO Auto-generated method stub
+    	}
     	@Override
     	public boolean validateParameters() {
     		return true;
+    	}
+    }

     package org.txm.objects;
     import java.util.List;
     import org.txm.core.results.TXMParameters;
     /**
      * not used ?
      * deprecated ?
-...
      */
     public class Alignement extends TxmObject {
     	private static final long serialVersionUID = -8729114900304447071L;
     	String from, to , struct;
     	int level;
     	public Alignement(String from2, String to2, String struct2, int level2) {
     	public Alignement(Base base, String from2, String to2, String struct2, int level2) {
     		super(base);
     		from = from2;
     		to = to2;
     		struct = struct2;
     		level= level2;
+    	}
     	public List<? extends TxmObject> getChildren() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	public TxmObject removeChildren(TxmObject children) {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	public boolean hasChildren(TxmObject children) {
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	@Override
     	public TxmObject getParent() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	@Override
     	public boolean load() {
     		// TODO Auto-generated method stub
     		// TODO should read the members from the Element attributes
     		return false;
+    	}
     	@Override
     	public boolean save() {
     		// TODO Auto-generated method stub
     		// TODO should write the members to the Element attributes
     		return false;
+    	}
     	@Override
     	public String getSimpleName() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	@Override
     	public String getDetails() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	@Override
     	public void clean() {
     		// TODO Auto-generated method stub
+    	}
     	@Override
     	public boolean validateParameters() {
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	@Override
     	public boolean setParameters(TXMParameters parameters) {
     		return false;
+    	}
+    }

tmp/org.txm.core/src/java/org/txm/objects/Text.java (revision 526)
73	73	* @param text the text
74	74	*/
75	75	public Text(Corpus corpus, Element text) {
	76	super(corpus);
76	77	this.setPath(corpus.getPath() + getName());
77	78	this.corpus = corpus;
78	79	setSelfElement(text);

     	 * @param query the query
     	 * @param examples the examples
     	 */
     	public SavedQuery(Corpus c, String query, List<String> examples) {
     	public SavedQuery(Corpus c, String query, List<String> examples) {
     		super(c);
     		this.corpus = c;
     		this.value = query;
     		if (examples == null)
-...
     	 * @param corpus the b
     	 * @param e the e
     	 */
     	public SavedQuery(Corpus corpus, Element e) {
     	public SavedQuery(Corpus corpus, Element e) {
     		super(corpus);
     		this.corpus = corpus;
     		this.setSelfElement(e);
     		this.load();

     import java.io.File;
     import java.util.ArrayList;
     import java.util.Comparator;
     import java.util.List;
     import java.util.regex.Matcher;
     import java.util.regex.Pattern;
     import java.util.regex.PatternSyntaxException;
-...
     	 * @param edition the edition
     	 */
     	public Edition(Text text, Element edition) {
     		super(text);
     		this.setPath(text.getPath() + getName());
     		setSelfElement(edition);
     		this.text = text;
-...
     		return p;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#getChildren()
     	 */
     	public List<TxmObject> getChildren() {
     		List<TxmObject> rez = new ArrayList<TxmObject>();
     		rez.addAll(this.getPages());
     		return rez;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#removeChildren(org.txm.objects.TxmObject)
     	 */
     	public TxmObject removeChildren(TxmObject o) {
     		if (o == null)
     			return null;
     		if (o instanceof Page) {
     			getSelfElement().removeChild(o.getSelfElement());
     			if (pages.remove(o))
     				return o;
     			else
     				return null;
+    		}
     		return null;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#hasChildren(org.txm.objects.TxmObject)
     	 */
     	public boolean hasChildren(TxmObject o) {
     		if (o == null)
     			return false;
     		if (o instanceof Page)
     			return pages.contains(o);
     		return false;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#getParent()
     	 */
     	@Override
     	public TxmObject getParent() {
     		return getText();
+    	}
     	public File getHtmlDir() {
     		if (defaultHtmlDir == null) {
     			String corpusname = getText().getCorpus().getName();
-...
+    			}
+    		}
+    	}
     	@Override
     	public String getSimpleName() {
     		return getName();
+    	}
     	@Override
     	public String getDetails() {
     		return getName();
+    	}
     	@Override
     	public void clean() {
+    	}
     	@Override
     	public boolean validateParameters() {
     		return true;
+    	}
+    }

     	 * @param xmlproject the xmlproject
     	 */
     	public Workspace(File xmlproject) {
     		super(null);
     		name = xmlproject.getName();
     		this.setPath(xmlproject.getAbsolutePath());
     		this.xmlfile = xmlproject;
-...
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	@Override
     	public boolean _compute() throws Exception {
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	@Override
     	public boolean toTxt(File arg0, String arg1, String arg2, String arg3) throws Exception {
     		// TODO Auto-generated method stub
     		return false;
+    	}
+    }

     				String from = split[1].trim();
     				String to = split[2].trim();
     				Alignement align = new Alignement(from, to,
     				Alignement align = new Alignement(this.corpus.getBase(), from, to,
     						link.getAttribute("alignElement"), Integer.parseInt(link.getAttribute("alignLevel")));
     				links.put("#"+from+" #"+to, align);
     				align = new Alignement(to, from,
     				align = new Alignement(this.corpus.getBase(), to, from,
     						link.getAttribute("alignElement"), Integer.parseInt(link.getAttribute("alignLevel")));
     				links.put("#"+to+" #"+from, align);

     //
     package org.txm.objects;
     import java.io.File;
     import java.io.Serializable;
     import java.util.HashMap;
     import java.util.Map;
-...
     	/** The object path from the object root to it. */
     	private String path;
     	/**
     	 * Creates a new TxmObject with no parent.
     	 */
     	public TxmObject() {
     		this(null);
+    	}
     	/**
     	 * Creates a new TxmObject, child of the specified parent.
-...
     	public boolean setParameters(TXMParameters parameters) {
     		return false;
+    	}
     	@Override
     	public String getSimpleName() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	@Override
     	public String getDetails() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	@Override
     	public void clean() {
     		// TODO Auto-generated method stub
+    	}
     	@Override
     	public boolean validateParameters() {
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	@Override
     	public boolean _compute() throws Exception {
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	@Override
     	public boolean toTxt(File arg0, String arg1, String arg2, String arg3) throws Exception {
     		// TODO Auto-generated method stub
     		return false;
+    	}
+    }

tmp/org.txm.core/src/java/org/txm/objects/Script.java (revision 526)
74	74	* @param script the script
75	75	*/
76	76	public Script(Base b, Element script) {
	77	super(b);
77	78	this.setPath(b.getPath() + getName());
78	79	setSelfElement(script);
79	80	base = b;

     	 * @param project the project
     	 */
     	public Project(Workspace workspace, Element project) {
     		super(workspace);
     		this.workspace = workspace;
     		setSelfElement(project);
     		load();
-...
+    					}
+    				}
     //TODO: errrkk why?
     //				int iname = 2;
     //				String originalName = name;
     //				while (loaded.contains(name) && iname < 10) { // building new name if duplicated
     //					name = originalName + (iname++);
     //				}
     //				if (iname > 2) { // name was fixed
     //					System.out.println(Messages.bind(Messages.Project_3,name));
     //					if (iname > 10) { // too much duplicates
     //						System.out.println(Messages.Project_4+name);
     //						basesElem.removeChild(base);
     //					} else {
     //						base.setAttribute(NAME, name);
     //						System.out.println(Messages.Project_16+originalName+" "+name); //$NON-NLS-2$
     //					}
     //				}
     				if (PARAMS.exists() && PARAMS.canRead()) {
     					BaseParameters parameters = new BaseParameters(PARAMS);
-...
     					System.out.println("DATAc: "+DATAc+" : "+DATAc.exists()); //$NON-NLS-1$ //$NON-NLS-2$
     					continue;
+    				}
     //				// patch registry // no more needed, CQP registry path is now a list of registry paths
     //				File txmregistry = new File(Toolbox.getParam(Toolbox.CQI_SERVER_PATH_TO_REGISTRY));
     //				if (!txmregistry.exists()) {
     //					System.out.println(Messages.Project_25+txmregistry);
     //					Log.severe(Messages.Project_25+txmregistry);
     //					return null;
     //				}
     				// the registry path need to be patched, because CQP does NOT manage relative paths (or we don't know how to manage it :))
     				//System.out.println("Updating "+REGISTRYc+" with "+DATAc);
     				//PatchCwbRegistry.patch(REGISTRYc, DATAc);
+    			}
     			return b;
-...
     		return bases.values();
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#getChildren()
     	 */
     	public List<TxmObject> getChildren() {
     		List<TxmObject> rez = new ArrayList<TxmObject>();
     		rez.addAll(this.getBases());
     		return rez;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#removeChildren(org.txm.objects.TxmObject)
     	 */
     	public TxmObject removeChildren(TxmObject o) {
     		if (o == null)
     			return null;
     		if (o instanceof Base) {
     			removeBase(((Base)o).getName());
+    		}
     		return null;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#hasChildren(org.txm.objects.TxmObject)
     	 */
     	public boolean hasChildren(TxmObject o) {
     		if (o == null)
     			return false;
     		if (o instanceof Base)
     			return bases.containsKey(((Base) o).getName());
     		return false;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#getParent()
     	 */
     	@Override
     	public TxmObject getParent() {
     		return getWorkspace();
+    	}
     	/**
     	 * Gets the base names.
+    	 *
-...
     	public List<String> getBaseNames() {
     		return new ArrayList<String>(this.bases.keySet());
+    	}
     	@Override
     	public String getSimpleName() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	@Override
     	public String getDetails() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	@Override
     	public void clean() {
     		// TODO Auto-generated method stub
+    	}
     	@Override
     	public boolean validateParameters() {
     		// TODO Auto-generated method stub
     		return false;
+    	}
+    }

     //
     package org.txm.objects;
     import java.util.List;
     // TODO: Auto-generated Javadoc
     /**
      * The Class Partition.
      */
     public class Partition extends TxmObject {
     	public Partition(Corpus parent) {
     		super(parent);
+    	}
     	/** The Constant serialVersionUID. */
     	private static final long serialVersionUID = 1921103951325044667L;
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#getChildren()
     	 */
     	public List<TxmObject> getChildren() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#hasChildren(org.txm.objects.TxmObject)
     	 */
     	public boolean hasChildren(TxmObject children) {
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#load()
     	 */
     	@Override
-...
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#removeChildren(org.txm.objects.TxmObject)
     	 */
     	public TxmObject removeChildren(TxmObject children) {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#save()
     	 */
     	@Override
-...
     		return false;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#getParent()
     	 */
     	@Override
     	public TxmObject getParent() {
     		// TODO Auto-generated method stub
     		return null;
+    	}
     	@Override
     	public String getSimpleName() {
     		return getName();
+    	}
     	@Override
     	public String getDetails() {
     		return getName();
+    	}
     	@Override
     	public void clean() {
+    	}
     	@Override
     	public boolean validateParameters() {
     		return true;
+    	}
+    }

     	 * @param parameters the b
     	 */
     	public Base(Project project, BaseParameters parameters) {
     		super(project);
     		this.setPath(project.getPath() + getName());
     		params = parameters;
     		setSelfElement(params.root);
-...
     			String from = split[1].trim();
     			String to = split[2].trim();
     			Alignement align = new Alignement(from, to,
     			Alignement align = new Alignement(this, from, to,
     					link.getAttribute("alignElement"), Integer.parseInt(link.getAttribute("alignLevel"))); //$NON-NLS-1$ //$NON-NLS-2$
     			links.put("#"+from+" #"+to, align); //$NON-NLS-1$ //$NON-NLS-2$
     			align = new Alignement(to, from,
     			align = new Alignement(this, to, from,
     					link.getAttribute("alignElement"), Integer.parseInt(link.getAttribute("alignLevel"))); //$NON-NLS-1$ //$NON-NLS-2$
     			links.put("#"+to+" #"+from, align); //$NON-NLS-1$ //$NON-NLS-2$
+    		}
-...
     	public BaseParameters getBaseParameters() {
     		return params;
+    	}
     	@Override
     	public String getSimpleName() {
     		return getName();
+    	}
     	@Override
     	public String getDetails() {
     		return getName();
+    	}
     	@Override
     	public void clean() {
+    	}
     	@Override
     	public boolean validateParameters() {
     		return true;
+    	}
+    }

     // Copyright © 2010-2013 ENS de Lyon.
     // Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
     // Lyon 2, University of Franche-Comté, University of Nice
     // Sophia Antipolis, University of Paris 3.
     //
     // 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.
     //
     // 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.
     //
     // 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.
     //
     //
     //
     // $LastChangedDate: 2016-09-19 10:31:00 +0200 (Mon, 19 Sep 2016) $
     // $LastChangedRevision: 3298 $
     // $LastChangedBy: mdecorde $
     //
     package org.txm.functions;
     import java.io.File;
     import java.io.IOException;
     import java.util.concurrent.Semaphore;
     import org.eclipse.core.runtime.IProgressMonitor;
     import org.txm.core.results.TXMParameters;
     import org.txm.core.results.TXMResult;
     import org.txm.utils.logger.Log;
     /**
+     *
      * A TXMResult that is able to compute itself using parameters and with or not a monitor
+     *
      * if setCurrentMonitor is called, then the IProgressMonitor methods will work.
+     *
      * Has methods to interact with a ProcessWatcher: set work amount, set messages, acquire/release interruption semaphore.
+     *
      * Call order :
      * MyCommand cmd = new MyCommand(parent)
      * cmd.setParameters(param1, param2, param3) OR cmd.setParameters(parameters) // parameters = new TXMParameters
      * if (cmd.validateParameters())
      * 		cmd.compute() OR cmd.compute(monitor) // if any IProgressMonitor available
+     *
      * @author mdecorde
      * @author nkredens
      */
     public abstract class TXMCommand extends TXMResult implements IProgressMonitor {
     	/**
     	 * if set, allows the command to notify its progress
     	 */
     	protected IProgressMonitor monitor;
     	public TXMCommand() {
     		super();
+    	}
     	public TXMCommand(TXMResult parent) {
     		super(parent);
+    	}
     	public TXMCommand(TXMResult parent, TXMParameters parameters) {
     		super(parent, parameters);
+    	}
     	Semaphore progressSemaphore = new Semaphore(1);
     	public void acquireSemaphore() {
     		try {
     			this.progressSemaphore.acquire();
     		} catch (InterruptedException e) {
     			Log.printStackTrace(e);
+    		}
+    	}
     	/**
     	 * Computes the result according to specified command parameters.
+    	 *
     	 * @param parameters
     	 * @return
     	 */
     	public boolean compute() throws Exception {
     		return this.compute(null);
+    	}
     	/**
     	 * Computes the result according to stored command parameters.
+    	 *
     	 * @param watcher
     	 * @return
     	 * @throws InvalidCqpIdException
     	 * @throws CqiServerError
     	 * @throws CqiClientException
     	 * @throws IOException
     	 */
     	public abstract boolean compute(IProgressMonitor watcher) throws Exception;
     // //removed for now, waiting to see if used
     //	/**
     //	 * Computes the result according to specified command parameters.
     //	 * @param watcher
     //	 * @param parameters
     //	 * @return
     //	 */
     //	public boolean compute(IProgressMonitor watcher, TXMParameters parameters) throws Exception {
     //		this.parameters = parameters;
     //		return this.compute(watcher);
     //	}
     	/**
+    	 *
     	 * @return the array of extensions to show in the FileDialog SWT widget
     	 */
     	@Deprecated
     	//FIXME: should be moved in an exporter extension
     	public String[] getExportTXTExtensions() {
     		return new String[]{"*.csv"};
+    	}
     	/**
+    	 *
     	 * @return true if the monitor has been canceled by the user
     	 */
     	public boolean isCanceled() {
     		if (monitor != null) {
     			return monitor.isCanceled();
+    		}
     		return false;
+    	}
     	/**
+    	 *
     	 * @return the parent Object that contains this result
     	 */
     	@Deprecated
     	// FIXME: to remove when TXMResult2 will be fully implemented
     	//public abstract HasResults getHasResultsParent();
     	public boolean tryAcquireSemaphore() {
     		return this.progressSemaphore.tryAcquire();
+    	}
     	public void releaseSemaphore() {
     		this.progressSemaphore.release();
+    	}
     	/**
     	 * You must set the current monitor to be available to manage the process progress
     	 * @param monitor can be null
     	 */
     	public void setCurrentMonitor(IProgressMonitor monitor) {
     		this.monitor = monitor;
+    	}
     	//public abstract boolean toTxt(File file, String encoding) throws Exception;
     	@Deprecated
     	//FIXME: should be moved in an exporter extension
     	public abstract boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception;
     	/**
     	 * increment the process
     	 * @param amount of work
     	 */
     	public void worked(int amount) {
     		if (monitor != null) {
     			//System.out.println("worked "+amount);
     			monitor.worked(amount);
+    		}
+    	}
     	/**
     	 * increment the progress and show a message
+    	 *
     	 * @param amount
     	 * @param message
     	 */
     	public void worked(int amount, String message) {
     		if (monitor != null) {
     			monitor.worked(amount);
     			monitor.subTask(message);
+    		}
+    	}
     	@Override
     	public void beginTask(String name, int totalWork) {
     		if (monitor != null) monitor.beginTask(name, totalWork);
+    	}
     	@Override
     	public void done() {
     		if (monitor != null) monitor.done();
+    	}
     	@Override
     	public void internalWorked(double work) {
     		if (monitor != null) monitor.internalWorked(work);
+    	}
     	@Override
     	public void setCanceled(boolean value) {
     		if (monitor != null) monitor.setCanceled(value);
+    	}
     	@Override
     	public void setTaskName(String name) {
     		if (monitor != null) monitor.setTaskName(name);
+    	}
     	@Override
     	public void subTask(String name) {
     		if (monitor != null) monitor.subTask(name);
+    	}
+    }

     /**
      * API to all knowned TXM commands.
+     *
      * Initialized during Toolbox initialisation using the TXMCommand extension point
      * Initialized during Toolbox initialisation using the TXMResult extension point
+     *
      * For now a command is :
      * - an ID
-...
     	protected static final HashMap<String, Command> cmds = new HashMap<String, Command>();
     	public static void install(String cmd, Class<TXMCommand> clazz) {
     	public static void install(String cmd, Class<TXMResult> clazz) {
     		CommandsAPI.cmds.put(cmd, new Command(cmd,clazz));
+    	}
-...
     	 * @param clazz
     	 * @param mandatory_parameters
     	 */
     	public static void install(String cmd, Class<TXMCommand> clazz, HashSet<String> mandatoryParameters) {
     	public static void install(String cmd, Class<TXMResult> clazz, HashSet<String> mandatoryParameters) {
     		Command command = new Command(cmd,clazz);
     		command.mandatoryParameters.addAll(mandatoryParameters);
     		CommandsAPI.cmds.put(cmd, command);
-...
     	 * @param mandatory_parameters
     	 * @param optional_parameters
     	 */
     	public static void install(String cmd, Class<TXMCommand> clazz, HashSet<String> mandatoryParameters, HashSet<String> optionalParameters) {
     	public static void install(String cmd, Class<TXMResult> clazz, HashSet<String> mandatoryParameters, HashSet<String> optionalParameters) {
     		Command command = new Command(cmd,clazz);
     		command.mandatoryParameters.addAll(mandatoryParameters);
     		command.optionalParameters.addAll(optionalParameters);
-...
+    		}
     		// compute directly the command using the parameters
     		TXMCommand result = null;
     		TXMResult result = null;
     		try {
     			if (command.mandatoryParameters.containsAll(parameters.keySet())) {
     				System.out.println("Computing "+command.cmd+"...");

     public class Command {
     	public final String cmd;
     	public final Class<TXMCommand> clazz;
     	public final Class<TXMResult> clazz;
     	public final HashSet<String> mandatoryParameters = new HashSet<String>();
     	public final HashSet<String> optionalParameters = new HashSet<String>();
     	public Command(Class<TXMCommand> clazz) {
     	public Command(Class<TXMResult> clazz) {
     		this.cmd = clazz.getSimpleName();
     		this.clazz = clazz;
+    	}
     	public Command(String cmd, Class<TXMCommand> clazz) {
     	public Command(String cmd, Class<TXMResult> clazz) {
     		this.cmd = cmd;
     		this.clazz = clazz;
+    	}

     import org.eclipse.core.runtime.IProgressMonitor;
     import org.txm.core.results.TXMParameters;
     import org.txm.functions.TXMCommand;
     import org.txm.core.results.TXMResult;
     import org.txm.internalview.core.Messages;
     import org.txm.searchengine.cqp.CQPEngine;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
-...
     import org.txm.searchengine.cqp.corpus.query.Match;
     import org.txm.searchengine.cqp.corpus.query.Query;
     public class InternalView extends TXMCommand  {
     public class InternalView extends TXMResult  {
     	Corpus corpus;
     	List<Property> pProperties;
-...
+    	}
     	@Override
     	public boolean compute(IProgressMonitor watcher) throws Exception {
     	public boolean _compute() throws Exception {
     		//find struct start-end
     		Query query = new Query("<"+pStructure.getName()+"> [] expand to "+pStructure); //$NON-NLS-1$ //$NON-NLS-2$
     		//System.out.println(query);
-...
     		HashMap<Property, List<String>> current = getPage(pCurrentStruct);
     		return current;
+    	}
     	@Override
     	public boolean saveParameters() {
     		// TODO Auto-generated method stub
     		return false;
+    	}
+    }

      */
     package org.txm.partition.core.functions;
     import java.io.File;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.Comparator;
-...
     	public boolean setParameters(TXMParameters parameters) {
     		return false;
+    	}
     	@Override
     	public boolean _compute() throws Exception {
     		// TODO move here the code from SWTChartsComponentsProvider that creates the chart to display
     		return false;
+    	}
     	@Override
     	public boolean toTxt(File arg0, String arg1, String arg2, String arg3) throws Exception {
     		// TODO Auto-generated method stub
     		return false;
+    	}
+    }

     import org.txm.chartsengine.r.core.themes.DefaultTheme;
     import org.txm.core.results.TXMParameters;
     import org.txm.core.results.TXMResult;
     import org.eclipse.core.runtime.IProgressMonitor;
     import org.txm.functions.TXMCommand;
     import org.txm.progression.core.messages.ProgressionCoreMessages;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.Corpus;
-...
      * @author mdecorde
      * @author sjacquot
      */
     public class Progression extends TXMCommand	{
     public class Progression extends TXMResult	{
     	/** The corpus. */
     	Corpus corpus;
-...
     	 * @throws CqiServerError
     	 * @throws IOException
     	 */
     	public boolean compute(IProgressMonitor monitor) throws CqiClientException, IOException, CqiServerError {
     	public boolean _compute() throws Exception {
     		return stepQueries() && stepStructuralUnits() && stepFinalize();
+    	}

     import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
     import org.txm.core.results.TXMParameters;
     import org.txm.core.results.TXMResult;
     import org.txm.functions.TXMCommand;
     import org.txm.index.core.functions.Index;
     import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
-...
      * @author mdecorde
+     *
      */
     public class Cooccurrence extends TXMCommand  {
     public class Cooccurrence extends TXMResult  {
     	/** The a. */
     	static double[] a = new double[101];
-...
     	 * @param buildLexicalTableWithCooccurrents
     	 * @return
     	 */
     	public boolean compute(IProgressMonitor monitor) {
     	public boolean _compute() {
     		this.monitor = monitor;
     		//FIXME: debug
     		//System.out.println("cooc: "+corpus+" "+query+" "+properties+" "+limit+" "+maxLeft+" "+minLeft+" "+minRight+" "+maxRight+" "+minFreq+" "+minCof+" "+minScore+" "+includeXpivot);

     import org.txm.core.preferences.TXMPreferences;
     import org.txm.core.results.TXMResult;
     import org.txm.core.results.TXMParameters;
     import org.txm.functions.TXMCommand;
     import org.eclipse.core.runtime.IProgressMonitor;
     import org.txm.searchengine.cqp.AbstractCqiClient;
     import org.txm.searchengine.cqp.CQPEngine;
-...
      * @author sjacquot
+     *
      */
     public class TextsBalance extends TXMCommand {
     public class TextsBalance extends TXMResult {
     	HashMap<Integer, Comparable[]> dataset;
-...
     	 * @param groupByTexts
     	 * @throws CqiClientException
     	 */
     	public boolean compute(IProgressMonitor watcher) {
     	public boolean _compute() {
     		this.name = su.getName() + "@" + suPropertyName + " (group by texts = " + groupByTexts + ")";
     		if (suPropertyName == null || suPropertyName.length() == 0) return false;
-...
     			this.values = p.getValues();
     			Collections.sort(values);
     			//int method = 2;
     			//System.out.println("Method: "+method);
     			//long time = System.currentTimeMillis();

     import org.txm.concordance.core.messages.ConcordanceMessages;
     import org.txm.concordance.core.preferences.ConcordancePreferences;
     import org.txm.core.results.TXMParameters;
     import org.txm.functions.TXMCommand;
     import org.txm.core.results.TXMResult;
     import org.txm.searchengine.cqp.AbstractCqiClient;
     import org.txm.searchengine.cqp.MemCqiClient;
     import org.txm.searchengine.cqp.Reference;
-...
+     *
      * @author jmague, mdecorde
      */
     public class Concordance extends TXMCommand {
     public class Concordance extends TXMResult {
     	/** The noconc. */
     	protected static int noconc = 1;;
-...
     	 * @throws CqiClientException
     	 */
     	@Override
     	public boolean compute(IProgressMonitor monitor) throws CqiClientException {
     	public boolean _compute() throws Exception {
     		this.queryResult = this.getCorpus().query(pQuery, pQuery.getQueryString()
     				.replace(" ", "_") + "_concordance", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-...
     		lines = new ArrayList<Line>(Collections.nCopies(nLines,

Laboratoire ICAR » Plateforme TXM

Révision 526