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

     	@Override
     	public boolean saveParameters() {
     		if (pQuery != null) {
     			this.saveParameter(ConcordancePreferences.QUERY, pQuery.getQueryString());
+    		}
     		this.saveParameter(ConcordancePreferences.KEYWORD_VIEW_PROPERTIES, WordProperty.fromListToPreferenceString(this.pViewKeywordProperties));
     		this.saveParameter(ConcordancePreferences.LEFT_VIEW_PROPERTIES, WordProperty.fromListToPreferenceString(this.pViewLeftProperties));

     	/** The prop separator. */
     	String propSeparator = " ; "; //$NON-NLS-1$
     	/**
     	 * Instantiates a new properties selector.
+    	 *

     			this.setPartName(this.getResult().getName());
     			firePropertyChange(TXMEditor.PROP_DIRTY);
     			if(!update)	{
     			//MD remove 'if (!update) {...}'
     				// FIXME: debug
     				System.err.println("TXMEditor.refresh(): auto updating editor from result.");
     				this.autoUpdateEditorFieldsFromResult(); // auto update from Parameter annotations
     				this.autoUpdateEditorFieldsFromResult(update); // auto update from Parameter annotations
     				// FIXME: debug
     				System.err.println("TXMEditor.refresh(): manually updating editor from result.");
     				System.err.println("TXMEditor.refresh(): subclass editor updating editor from result.");
     				this.updateEditorFromResult(update); // subclasses manual settings
+    			}
     			//this.__updateEditorFromResult(update); // essentially for ChartEditor
-...
     	/**
     	 * Synchronizes the result with editor parameters.
     	 * <p>
     	 * It should be called or called itself in the UI thread when accessing Widget parameters.
     	 */
     	public abstract void updateResultFromEditor();
-...
     	/**
     	 * Synchronizes the editor with the result.
     	 * Dedicated to dynamically change the editor components from the stored result.
     	 * <p>
     	 * Use this method if you need to save parameter with Type not managed by the autoUpdateEditorFieldsFromResult method
     	 */
     	public abstract void updateEditorFromResult(boolean update);
-...
     	/**
     	 * Updates the editor fields from result and declared parameters annotations.
     	 * Manages these widgets at this moment: ToolItem, FloatSpinner, Spinner, Text, Button, Viewer, PropertiesSelector, NewNavigationWidget.
     	 * <p>
     	 * Manages these widgets at this moment:
     	 * ToolItem+Boolean,
     	 * FloatSpinner+Float,
     	 * Spinner+Integer,
     	 * Text+String,
     	 * Button+Boolean, Viewer+any, PropertiesSelector+<P extends Property>, NewNavigationWidget+Integer.
     	 */
     	public void autoUpdateEditorFieldsFromResult()	{
     	public void autoUpdateEditorFieldsFromResult(boolean update)	{
     		List<Field> fields = this.getAllParameterFields();
-...
     						// FIXME: fire a new selection changed event leading to a cyclic recursion...
     						// FIXME: became useless? since there is now a test above on  !this.getResult().hasParameterChanged(parameter.key(), this.lastComputingParameters)
     						((Viewer)object).setData("ignore", true); //$NON-NLS-1$
     						((Viewer)object).setSelection(new StructuredSelection(value), true);
     						if (value instanceof StructuredSelection) { // no need to create a new StructuredSelection
     							((Viewer)object).setSelection((StructuredSelection)value, true);
     						} else {
     							((Viewer)object).setSelection(new StructuredSelection(value), true);
+    						}
     						((Viewer)object).setData("ignore", false); //$NON-NLS-1$
+    					}
+    				}

tmp/org.txm.jodconverter.core/resources/documents/test.csv (revision 718)
1		"Test spreadsheet"

     {\rtf1\ansi\deff0\adeflang1025
     {\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset0 Times New Roman;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\fnil\fprq2\fcharset0 DejaVu Sans;}}
     {\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
     {\stylesheet{\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang255\ltrch\dbch\af3\langfe255\hich\f0\fs24\lang2057\loch\f0\fs24\lang2057\snext1 Normal;}
     {\s2\sb240\sa120\keepn\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\afs28\lang255\ltrch\dbch\langfe255\hich\f2\fs28\lang2057\loch\f2\fs28\lang2057\sbasedon1\snext3 Heading;}
     {\s3\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang255\ltrch\dbch\af3\langfe255\hich\f0\fs24\lang2057\loch\f0\fs24\lang2057\sbasedon1\snext3 Body Text;}
     {\s4\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang255\ltrch\dbch\af3\langfe255\hich\f0\fs24\lang2057\loch\f0\fs24\lang2057\sbasedon3\snext4 List;}
     {\s5\sb120\sa120\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang255\ai\ltrch\dbch\af3\langfe255\hich\f0\fs24\lang2057\i\loch\f0\fs24\lang2057\i\sbasedon1\snext5 caption;}
     {\s6\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang255\ltrch\dbch\af3\langfe255\hich\f0\fs24\lang2057\loch\f0\fs24\lang2057\sbasedon1\snext6 Index;}
+    }
     {\info{\author Mirko Nasato}{\creatim\yr2008\mo7\dy12\hr15\min3}{\author Mirko Nasato}{\revtim\yr2008\mo7\dy12\hr15\min3}{\printim\yr0\mo0\dy0\hr0\min0}{\comment StarWriter}{\vern6800}}\deftab709
     {\*\pgdsctbl
     {\pgdsc0\pgdscuse195\pgwsxn11905\pghsxn16837\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\pgdscnxt0 Standard;}}
     \paperh16837\paperw11905\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\pgwsxn11905\pghsxn16837\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
     \pard\plain \ltrpar\s1\cf0{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\rtlch\af3\afs24\lang255\ltrch\dbch\af3\langfe255\hich\f0\fs24\lang2057\loch\f0\fs24\lang2057 {\rtlch \ltrch\loch\f0\fs24\lang2057\i0\b0 Test document}
     \par }

tmp/org.txm.jodconverter.core/resources/documents/test.txt (revision 718)
1		Test document

     <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
     <HTML>
     <HEAD>
     	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
     	<TITLE></TITLE>
     	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.4  (Linux)">
     	<META NAME="AUTHOR" CONTENT="Mirko Nasato">
     	<META NAME="CREATED" CONTENT="20080712;15031700">
     	<META NAME="CHANGEDBY" CONTENT="Mirko Nasato">
     	<META NAME="CHANGED" CONTENT="20080712;15034700">
     	<STYLE TYPE="text/css">
     	<!--
     		@page { margin: 2cm }
     		P { margin-bottom: 0.21cm }
     		P.western { so-language: en-GB }
     	-->
     	</STYLE>
     </HEAD>
     <BODY LANG="en-GB" DIR="LTR">
     <P CLASS="western" STYLE="margin-bottom: 0cm">Test document</P>
     </BODY>
     </HTML>

     import org.rosuda.REngine.REXPMismatchException;
     import org.txm.concordance.core.functions.Concordance;
     import org.txm.concordance.core.functions.Line;
     import org.txm.concordance.core.preferences.ConcordancePreferences;
     import org.txm.cooccurrence.core.functions.comparators.CLineComparator;
     import org.txm.cooccurrence.core.messages.CooccurrenceCoreMessages;
     import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
-...
     	@Override
     	public boolean saveParameters() {
     		// TODO Auto-generated method stub
     		System.err.println("Cooccurrence.saveParameters(): not yet implemented.");
     		this.saveParameter(CooccurrencePreferences.PROPERTIES, WordProperty.fromListToPreferenceString(this.pProperties));
     		if (pQuery != null) {
     			this.saveParameter(CooccurrencePreferences.QUERY, pQuery.getQueryString());
+    		}
     		if (pStructuralUnitLimit != null) {
     			this.saveParameter(CooccurrencePreferences.STRUCTURE_LIMIT, this.pStructuralUnitLimit.getName());
+    		}
     		return true;
+    	}
     	public void setQuery(Query query) {
     		this.pQuery = query;
+    	}

     //
     package org.txm.searchengine.cqp.corpus;
     import java.io.Serializable;
     import java.util.ArrayList;
     import java.util.Collections;
     import java.util.List;
-...
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.searchengine.cqp.corpus.query.Query;
     import org.txm.utils.logger.Log;
     // TODO: Auto-generated Javadoc
     /**
      * A Property on the structural units the corpus. Represents a
      * <strong>type</strong>, not a the value for a specific unit.

tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/WordProperty.java (revision 718)
33	33	public static List<Property> fromStringToList(Corpus corpus, String s) {
34	34	ArrayList<Property> properties = new ArrayList<Property>();
35	35	if (s == null) return properties;
36
	36
37	37	String[] split = s.split("\t");
38	38	for (String s2 : split) {
39	39	try {
...	...
50	50	}
51	51
52	52	public static String fromListToPreferenceString(List<Property> pProperties) {
	53	if (pProperties == null){
	54	return "";
	55	}
	56
53	57	ArrayList<String> names = new ArrayList<String>();
	58
54	59	for (Property p : pProperties) {
55	60	names.add(p.getName());
56	61	}
	62
57	63	return StringUtils.join(names, "\t");
58	64	}
59	65	}
60	66

Laboratoire ICAR » Plateforme TXM

Revision 718