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

     	@Override
     	public void clean() {
     		// TODO Auto-generated method stub
+    	}
     	@Override
-...
     		// TODO Auto-generated method stub
     		return false;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#removeChildren(org.txm.objects.TxmObject)
     	 */
     	public TxmObject removeChildren(TxmObject o) {
     		if (super.removeResult(o)) {
     			getSelfElement().removeChild(o.getSelfElement());
+    		}
     		return o;
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.objects.TxmObject#hasChildren(org.txm.objects.TxmObject)
     	 */
     	public boolean hasChildren(TxmObject o) {
     		return this.getResults(TxmObject.class).contains(o);
+    	}
+    }

     	QueryWidget querywidget;
     	/** The props area. */
     	protected PropertiesSelector propsArea;
     	protected PropertiesSelector<Property> propsArea;
     	/** The pattern area. */
     	protected PropertiesSelector patternArea;
     	protected PropertiesSelector<Property> patternArea;
     	/** The navigation area. */
     	NavigationWidget navigationArea;

     	private ArrayList<Property> availableRightSortProperties;
     	/**
+    	 *
     	 * @param corpus
     	 * @param v
     	 * @return a list of word properties read from a String
     	 */
     	public static List<Property> stringToProperties(Corpus corpus, String v)  {
     		ArrayList<Property> props = new ArrayList<Property>();
     		if (v == null) return props;
     		if (v.length() == 0) return props;
     		String[] split = v.split("\t");
     		for (String s : split) {
     			Property prop;
     			try {
     				prop = corpus.getProperty(s);
     			} catch (CqiClientException e) {
     				System.out.println("Error: "+v+" property not found in "+corpus);
     				Log.printStackTrace(e);
     				return null;
+    			}
     			if (prop != null) {
     				props.add(prop);
+    			}
+    		}
     		return props;
+    	}
     	/**
+    	 *
     	 * @param corpus
     	 * @param v
     	 * @return a list of word and structure properties read from a String
     	 */
     	public static ReferencePattern stringToReferencePattern(Corpus corpus, String v) {
     		try {
     			ReferencePattern props = new ReferencePattern();
     			if (v == null) return props;
     			if (v.length() == 0) return props;
     			String[] split = v.split("\t");
     			for (String s : split) {
     				if (s.contains("_")) {
     					String[] split2 = s.split("_", 2);
     					StructuralUnit su = corpus.getStructuralUnit(split2[0]);
     					if (su != null) {
     						Property prop = su.getProperty(split2[1]);
     						if (prop != null) {
     							props.addProperty(prop);
+    						}
+    					}
     				} else {
     					Property prop = corpus.getProperty(s);
     					if (prop != null) {
     						props.addProperty(prop);
+    					}
+    				}
+    			}
     			return props;
     		} catch (Exception e) {
     			System.out.println("Error: "+v+" property not found in "+corpus);
     			return null;
+    		}
+    	}
     	public Concordance(Corpus corpus) {
     		super(corpus);
-...
     		try {
     			String propertyNames = this.getStringParameterValue(ConcordancePreferences.KEYWORD_VIEW_PROPERTIES);
     			this.pViewKeywordProperties = Concordance.stringToProperties(corpus, propertyNames);
     			this.pViewKeywordProperties = Property.stringToProperties(corpus, propertyNames);
     			this.availableKeywordViewProperties = new ArrayList<Property>(corpus.getOrderedProperties());
     			this.availableKeywordViewProperties.removeAll(pViewKeywordProperties);
     			propertyNames = this.getStringParameterValue(ConcordancePreferences.LEFT_VIEW_PROPERTIES);
     			this.pViewLeftProperties = Concordance.stringToProperties(corpus, propertyNames);
     			this.pViewLeftProperties = Property.stringToProperties(corpus, propertyNames);
     			this.availableLeftViewProperties = new ArrayList<Property>(corpus.getOrderedProperties());
     			this.availableLeftViewProperties.removeAll(pViewLeftProperties);
     			propertyNames = this.getStringParameterValue(ConcordancePreferences.RIGHT_VIEW_PROPERTIES);
     			this.pViewRightProperties = Concordance.stringToProperties(corpus, propertyNames);
     			this.pViewRightProperties = Property.stringToProperties(corpus, propertyNames);
     			this.availableRightViewProperties = new ArrayList<Property>(corpus.getOrderedProperties());
     			this.availableRightViewProperties.removeAll(pViewRightProperties);
     			propertyNames = this.getStringParameterValue(ConcordancePreferences.KEYWORD_ANALYSIS_PROPERTIES);
     			this.pAnalysisKeywordProperties = Concordance.stringToProperties(corpus, propertyNames);
     			this.pAnalysisKeywordProperties = Property.stringToProperties(corpus, propertyNames);
     			this.availableKeywordSortProperties = new ArrayList<Property>(corpus.getOrderedProperties());
     			this.availableKeywordSortProperties.removeAll(pAnalysisKeywordProperties);
     			propertyNames = this.getStringParameterValue(ConcordancePreferences.LEFT_ANALYSIS_PROPERTIES);
     			this.pAnalysisLeftProperties = Concordance.stringToProperties(corpus, propertyNames);
     			this.pAnalysisLeftProperties = Property.stringToProperties(corpus, propertyNames);
     			this.availableLeftSortProperties = new ArrayList<Property>(corpus.getOrderedProperties());
     			this.availableLeftSortProperties.removeAll(pAnalysisLeftProperties);
     			propertyNames = this.getStringParameterValue(ConcordancePreferences.RIGHT_ANALYSIS_PROPERTIES);
     			this.pAnalysisRightProperties = Concordance.stringToProperties(corpus, propertyNames);
     			this.pAnalysisRightProperties = Property.stringToProperties(corpus, propertyNames);
     			this.availableRightSortProperties = new ArrayList<Property>(corpus.getOrderedProperties());
     			this.availableRightSortProperties.removeAll(pAnalysisRightProperties);
-...
     					this.pViewRefPattern = new ReferencePattern(refProperty);
+    				}
     			} else {
     				this.pViewRefPattern = Concordance.stringToReferencePattern(corpus, refPropertyNames);
     				this.pViewRefPattern = ReferencePattern.stringToReferencePattern(corpus, refPropertyNames);
+    			}
     			refPropertyNames = this.getStringParameterValue(ConcordancePreferences.ANALYSIS_REFERENCEPATTERN);
-...
     					this.pAnalysisRefPattern = new ReferencePattern(refProperty);
+    				}
     			} else {
     				this.pAnalysisRefPattern = Concordance.stringToReferencePattern(corpus, refPropertyNames);
     				this.pAnalysisRefPattern = ReferencePattern.stringToReferencePattern(corpus, refPropertyNames);
+    			}
     		} catch (CqiClientException e) {
     			// TODO Auto-generated catch block
-...
     			if (p instanceof List<?>) this.pAnalysisLeftProperties = (List<Property>)p;
     			else {
     				String v = p.toString();
     				this.pAnalysisLeftProperties = Concordance.stringToProperties(getCorpus(), v);
     				this.pAnalysisLeftProperties = Property.stringToProperties(getCorpus(), v);
+    			}
+    		}
-...
     			if (p instanceof List<?>) this.pAnalysisRightProperties = (List<Property>)p;
     			else {
     				String v = p.toString();
     				this.pAnalysisRightProperties = Concordance.stringToProperties(getCorpus(), v);
     				this.pAnalysisRightProperties = Property.stringToProperties(getCorpus(), v);
+    			}
+    		}
-...
     			if (p instanceof List<?>) this.pAnalysisKeywordProperties = (List<Property>)p;
     			else {
     				String v = p.toString();
     				this.pAnalysisKeywordProperties = Concordance.stringToProperties(getCorpus(), v);
     				this.pAnalysisKeywordProperties = Property.stringToProperties(getCorpus(), v);
+    			}
+    		}
-...
     			if (p instanceof List<?>) this.pViewLeftProperties = (List<Property>)p;
     			else {
     				String v = p.toString();
     				this.pViewLeftProperties = Concordance.stringToProperties(getCorpus(), v);
     				this.pViewLeftProperties = Property.stringToProperties(getCorpus(), v);
+    			}
+    		}
-...
     			if (p instanceof List<?>) this.pViewRightProperties = (List<Property>)p;
     			else {
     				String v = p.toString();
     				this.pViewRightProperties = Concordance.stringToProperties(getCorpus(), v);
     				this.pViewRightProperties = Property.stringToProperties(getCorpus(), v);
+    			}
+    		}
-...
     			if (p instanceof List<?>) this.pViewKeywordProperties = (List<Property>)p;
     			else {
     				String v = p.toString();
     				this.pViewKeywordProperties = Concordance.stringToProperties(getCorpus(), v);
     				this.pViewKeywordProperties = Property.stringToProperties(getCorpus(), v);
+    			}
+    		}
-...
     			if (p instanceof ReferencePattern) this.pViewRefPattern = (ReferencePattern)p;
     			else {
     				String v = p.toString();
     				this.pViewRefPattern = Concordance.stringToReferencePattern(getCorpus(), v);
     				this.pViewRefPattern = ReferencePattern.stringToReferencePattern(getCorpus(), v);
+    			}
+    		}
-...
     			if (p instanceof ReferencePattern) this.pAnalysisRefPattern = (ReferencePattern)p;
     			else {
     				String v = p.toString();
     				this.pAnalysisRefPattern = Concordance.stringToReferencePattern(getCorpus(), v);
     				this.pAnalysisRefPattern = ReferencePattern.stringToReferencePattern(getCorpus(), v);
+    			}
+    		}

     package org.txm.functions.internal;
     import java.io.File;
     import java.io.PrintWriter;
     import java.util.ArrayList;
     import java.util.Collection;
     import java.util.HashMap;
     import java.util.LinkedHashMap;
     import java.util.List;
     import org.apache.commons.lang.StringUtils;
     import org.txm.core.results.TXMParameters;
     import org.txm.core.results.TXMResult;
     import org.txm.internalview.core.Messages;
-...
     import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
     import org.txm.searchengine.cqp.corpus.query.Match;
     import org.txm.searchengine.cqp.corpus.query.Query;
     import org.txm.utils.io.IOUtils;
     public class InternalView extends TXMResult  {
     	Corpus corpus;
     	List<Property> pProperties;
     	StructuralUnit pStructure;
     	List<StructuralUnitProperty> pStructProperties;
     	Integer pCurrentStruct = -1;
     	protected List<Property> availablesProperties;
     	protected List<StructuralUnit> availableStructs;
     	protected List<StructuralUnitProperty> availableStructuralUnitProperties;
     	protected Corpus corpus;
     	protected List<Match> matches = new ArrayList<Match>();
     	protected int nmatches = 0;
     	protected Integer pCurrentPage = -1;
     	protected List<Property> pProperties;
     	int nmatches = 0;
     	List<Match> matches = new ArrayList<Match>();
     	protected List<StructuralUnitProperty> pStructProperties;
     	protected StructuralUnit pStructure;
     	public InternalView(Corpus corpus) {
     		super(corpus);
     		this.corpus = corpus;
     		try {
     			String propNames = this.getStringParameterValue(InternalViewPreferences.PROPERTIES);
     			pProperties = Property.stringToProperties(corpus, propNames);
     			availablesProperties = new ArrayList<Property>(corpus.getOrderedProperties());
     			availablesProperties.removeAll(pProperties);
     			propNames = this.getStringParameterValue(InternalViewPreferences.STRUCTURALUNITS);
     			availableStructs = corpus.getStructuralUnits();
     			pStructure = StructuralUnit.stringToStructuralUnits(corpus, propNames).get(0);
     			availableStructs.remove(pStructure);
     			propNames = this.getStringParameterValue(InternalViewPreferences.STRUCTURALUNITPROPERTIES);
     			availableStructuralUnitProperties = pStructure.getProperties();
     			pStructProperties = StructuralUnitProperty.stringToStructuralUnitProperties(corpus, propNames);
     			availableStructuralUnitProperties.removeAll(pStructProperties);
     		} catch (CqiClientException e) {
     			e.printStackTrace();
+    		}
+    	}
     	public void setParameters(List<Property> properties, StructuralUnit struct, List<StructuralUnitProperty> structProperties, Integer currentStructure) {
     		if (properties != null) this.pProperties = properties;
     		if (struct != null) this.pStructure = struct;
     		if (structProperties != null) this.pStructProperties = structProperties;
     		if (currentStructure != null) this.pCurrentStruct = currentStructure;
     		dirty = true;
     	@Override
     	protected boolean _compute(boolean update) 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);
     		QueryResult result = corpus.query(query, "test", false); //$NON-NLS-1$
     		nmatches = result.getNMatch();
     		if (nmatches > 0) {
     			matches = result.getMatches();
+    		}
     		result.drop();
     		//System.out.println(matches);
     		dirty = false;
     		return nmatches > 0;
+    	}
     	public String getStructInfos() {
     	@Override
     	public boolean canCompute() {
     		return corpus != null &&
     				pStructure != null &&
     				pProperties != null &&
     				pProperties.size() > 0 &&
     				pStructProperties != null &&
     				pStructProperties.size() > 0;
+    	}
     		try {
     			if (pStructProperties.size() > 0) {
     				String str = Messages.InternalView_3;
     				for (Property sup : pStructProperties) {
     					int[] array = {getCurrentSegmentNo()};
     					str += " "+sup.getName()+"="+CQPEngine.getCqiClient().struc2Str(sup.getQualifiedName(), array)[0]; //$NON-NLS-1$ //$NON-NLS-2$
+    				}
     				return str;
+    			}
     		} catch (Exception e) {
     			System.out.println(Messages.InternalView_6+e.getMessage());
     			org.txm.utils.logger.Log.printStackTrace(e);
+    		}
     		return Messages.InternalView_7;
     	@Override
     	public void clean() {
     		// TODO Auto-generated method stub
+    	}
     	public HashMap<Property, List<String>> getNext() throws CqiClientException {
     		int next = pCurrentStruct + 1;
     		if (next < nmatches) {
     			return getPage(next);
+    		}
     		return new HashMap<Property, List<String>>();
     	public List<Property> getAvailableProperties() {
     		return availablesProperties;
+    	}
     	public HashMap<Property, List<String>> getPrevious() throws CqiClientException {
     		int previous = pCurrentStruct - 1;
     		if (previous >= 0 && previous < nmatches) {
     			return getPage(previous);
+    		}
     		return new HashMap<Property, List<String>>();
     	public List<StructuralUnit> getAvailableStructs() {
     		return availableStructs;
+    	}
     	public HashMap<Property, List<String>> getFirst() throws CqiClientException {
     		if (0 < nmatches) {
     			return getPage(0);
+    		}
     		return new HashMap<Property, List<String>>();
     	public Corpus getCorpus() {
     		return corpus;
+    	}
     	public HashMap<Property, List<String>> getLast() throws CqiClientException {
     		if (nmatches - 1 >= 0) {
     			return getPage(nmatches - 1);
     	public String getCurrentLocation() {
     		return ""+(pCurrentPage+1); //$NON-NLS-1$
+    	}
     	public HashMap<Property, List<String>> getCurrentPage() throws CqiClientException {
     		if (pCurrentPage == null || pCurrentPage < 0) {
     			pCurrentPage = 0;
+    		}
     		return new HashMap<Property, List<String>>();
     		HashMap<Property, List<String>> current = getPage(pCurrentPage);
     		return current;
+    	}
     	public Integer getCurrentSegmentNo() {
     		return pCurrentPage;
+    	}
     	public String getDetails() {
     		return corpus.getName()+" "+pStructure.getName()+" "+(pCurrentPage+1); //$NON-NLS-1$ //$NON-NLS-2$
+    	}
     	public Integer getFirst() throws CqiClientException {
     		pCurrentPage = 0;
     		return pCurrentPage;
+    	}
     	public Integer getLast() throws CqiClientException {
     		pCurrentPage = nmatches -1;
     		return pCurrentPage;
+    	}
     	public String getLocationTail() {
     		if (nmatches > 0)
     			return " / "+nmatches; //$NON-NLS-1$
     		return "";
+    	}
     	@Override
     	public String getName() {
     		if (pStructure != null) return pStructure.getName()+" "+pCurrentPage;
     		return corpus.getName();
+    	}
     	public Integer getNext() throws CqiClientException {
     		if (pCurrentPage < nmatches -1 ) {
     			pCurrentPage++;
+    		}
     		return pCurrentPage;
+    	}
     	public int getNSegment() {
     		return nmatches;
+    	}
     	/**
     	 * get the ith page and set the current page number to i
+    	 *
-...
     			for (Property prop : pProperties) {
     				rez.put(prop, Match.getValuesForProperty(prop, p));
+    			}
     			pCurrentStruct = i;
     			pCurrentPage = i;
+    		}
     		return rez;
+    	}
     	public void printNext() throws CqiClientException {
     		HashMap<Property, List<String>> seg = getNext();
     		if (seg.size() > 0)
     			System.out.println(seg);
     	public Integer getPrevious() throws CqiClientException {
     		pCurrentPage = Math.max(0, pCurrentPage-1);
     		return pCurrentPage;
+    	}
     	public void printPrevious() throws CqiClientException {
     		HashMap<Property, List<String>> seg = getPrevious();
     		if (seg.size() > 0)
     			System.out.println(seg);
+    	}
     	public void printSeg(HashMap<Property, List<String>> seg) {
     		Collection<List<String>> values = seg.values();
     		if(values.size() == 0) return;
     		for(List<String> list : values) {
     			for(String value : list)
     				System.out.print("\t"+value); //$NON-NLS-1$
     			System.out.println();
+    		}
     		System.out.println();
+    	}
     	public Corpus getCorpus() {
     		return corpus;
+    	}
     	public StructuralUnit getStructuralUnit() {
     		return pStructure;
+    	}
     	public List<Property> getProperties() {
     		return pProperties;
+    	}
     	public Integer getCurrentSegmentNo() {
     		return pCurrentStruct;
+    	}
     	public int getNSegment() {
     		return nmatches;
+    	}
     	public int getSegmentLength() {
     		if (matches.size() == 0) return 0;
     		if (matches.size() < pCurrentStruct) return 0;
     		if (pCurrentStruct == null) return 0;
     		if (matches.size() < pCurrentPage) return 0;
     		if (pCurrentPage == null) return 0;
     		Match m = matches.get(pCurrentStruct);
     		Match m = matches.get(pCurrentPage);
     		return m.size();
+    	}
     	public boolean isFirst() {
     		return pCurrentStruct == 0;
     	@Override
     	public String getSimpleName() {
     		return getName();
+    	}
     	public boolean isLast() {
     		return pCurrentStruct == nmatches - 1;
+    	}
     	public String getStructInfos() {
     	public String getLocationTail() {
     		if (nmatches > 0)
     			return " / "+nmatches; //$NON-NLS-1$
     		return "";
     		try {
     			if (pStructProperties.size() > 0) {
     				String str = Messages.InternalView_3;
     				for (Property sup : pStructProperties) {
     					int[] array = {getCurrentSegmentNo()};
     					str += " "+sup.getName()+"="+CQPEngine.getCqiClient().struc2Str(sup.getQualifiedName(), array)[0]; //$NON-NLS-1$ //$NON-NLS-2$
+    				}
     				return str;
+    			}
     		} catch (Exception e) {
     			System.out.println(Messages.InternalView_6+e.getMessage());
     			org.txm.utils.logger.Log.printStackTrace(e);
+    		}
     		return Messages.InternalView_7;
+    	}
     	public String getCurrentLocation() {
     		return ""+(pCurrentStruct+1); //$NON-NLS-1$
     	public StructuralUnit getStructuralUnit() {
     		return pStructure;
+    	}
     	public String getDetails() {
     		// TODO Auto-generated method stub
     		return corpus.getName()+" "+pStructure.getName()+" "+(pCurrentStruct+1); //$NON-NLS-1$ //$NON-NLS-2$
     	public boolean isFirst() {
     		return pCurrentPage == 0;
+    	}
     	@Override
     	public String getName() {
     		// TODO Auto-generated method stub
     		return null;
     	public boolean isLast() {
     		return pCurrentPage == nmatches - 1;
+    	}
     	@Override
     	public String getSimpleName() {
     		// TODO Auto-generated method stub
     		return null;
     	public void printSeg(HashMap<Property, List<String>> seg) {
     		Collection<List<String>> values = seg.values();
     		if(values.size() == 0) return;
     		for(List<String> list : values) {
     			for(String value : list)
     				System.out.print("\t"+value); //$NON-NLS-1$
     			System.out.println();
+    		}
     		System.out.println();
+    	}
     	@Override
     	public void clean() {
     		// TODO Auto-generated method stub
     	public void setParameters(List<Property> properties, StructuralUnit struct, List<StructuralUnitProperty> structProperties, Integer currentStructure) {
     		if (properties != null) this.pProperties = properties;
     		if (struct != null) this.pStructure = struct;
     		if (structProperties != null) this.pStructProperties = structProperties;
     		if (currentStructure != null) this.pCurrentPage = currentStructure;
     		dirty = true;
+    	}
     	@Override
     	public boolean canCompute() {
     		return corpus != null && pStructure != null && pProperties != null && pProperties.size() > 0 && pStructProperties != null && pStructProperties.size() > 0;
     	public boolean setParameters(TXMParameters parameters) {
     		return false;
+    	}
     	@Override
     	protected boolean _compute(boolean update) 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);
     		QueryResult result = corpus.query(query, "test", false); //$NON-NLS-1$
     		nmatches = result.getNMatch();
     		if (nmatches > 0) {
     			matches = result.getMatches();
+    		}
     		result.drop();
     		//System.out.println(matches);
     		dirty = false;
     		return nmatches > 0;
     	public void setStructuralUnit(StructuralUnit structuralUnit) {
     		this.pStructure = structuralUnit;
+    	}
     	@Override
     	public boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception {
     		// TODO Auto-generated method stub
     		PrintWriter writer = IOUtils.getWriter(outfile, encoding);
     		for (int ipage = 0 ; ipage < nmatches ; ipage++) { // run through all pages
     			LinkedHashMap<Property, List<String>> page = getPage(ipage);
     			for (Property p : pProperties) {
     				writer.println(StringUtils.join(page.get(p), colseparator));
+    			}
     			writer.println("\n\n");
+    		}
     		writer.close();
     		return false;
+    	}
     	@Override
     	public boolean setParameters(TXMParameters parameters) {
     		return false;
     	public void setStructuralUnitProperties(ArrayList<StructuralUnitProperty> supList) {
     		this.pStructProperties = supList;
+    	}
     	public HashMap<Property, List<String>> getCurrentPage() throws CqiClientException {
     		if (pCurrentStruct == null || pCurrentStruct < 0) {
     			return getFirst();
+    		}
     		HashMap<Property, List<String>> current = getPage(pCurrentStruct);
     		return current;
     	public List<StructuralUnitProperty> getAvailableStructuralUnitProperties() {
     		return availableStructuralUnitProperties;
+    	}
     	@Override
     	public boolean saveParameters() {
     		// TODO Auto-generated method stub
     		return false;
     	public List<StructuralUnitProperty> getStructuralUnitProperties() {
     		return pStructProperties;
+    	}
+    }

     	public static String PREFERENCES_NODE = FrameworkUtil.getBundle(InternalViewPreferences.class).getSymbolicName();
     	/** the selected word properties */
     	public static final String PROPERTIES = "properties";
     	/** the selected structural units */
     	public static final String STRUCTURALUNITS = "structuralunits";
     	/** the selected structure properties */
     	public static final String STRUCTURALUNITPROPERTIES = "structuralunitsproperties";
     	/** the current page number */
     	public static final String CURRENTPAGE = "current_page";
     	@Override
     	public void initializeDefaultPreferences() {
     		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
     		preferences.put(PROPERTIES, "word");
     		preferences.put(STRUCTURALUNITS, "text");
     		preferences.putInt(CURRENTPAGE, 0);
+    	}
+    }

     import java.util.HashSet;
     import java.util.List;
     import org.eclipse.core.runtime.IProgressMonitor;
     import org.eclipse.core.runtime.IStatus;
     import org.eclipse.core.runtime.Status;
     import org.eclipse.jface.action.MenuManager;
     import org.eclipse.jface.viewers.ColumnLabelProvider;
     import org.eclipse.jface.viewers.IStructuredContentProvider;
-...
     import org.txm.internalview.rcp.AdapterFactory;
     import org.txm.internalview.rcp.Messages;
     import org.txm.rcp.IImageKeys;
     import org.txm.rcp.JobsTimer;
     import org.txm.rcp.editors.TXMEditorPart;
     import org.txm.rcp.editors.TXMResultEditorInput;
     import org.txm.rcp.editors.TableKeyListener;
     import org.txm.rcp.swt.widget.NavigationWidget;
     import org.txm.rcp.swt.widget.PropertiesSelector;
     import org.txm.rcp.utils.JobHandler;
     import org.txm.rcp.views.corpora.CorporaView;
     import org.txm.searchengine.cqp.CQPEngine;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
-...
     	public static final String ID = InternalViewEditor.class.getName();
     	Corpus corpus;
     	InternalView internalView;
     	protected Corpus corpus;
     	protected InternalView internalView;
     	protected Combo structCombo;
     	protected PropertiesSelector<Property> propSelector;
     	protected PropertiesSelector<StructuralUnitProperty> structSelector;
     	protected TableViewer viewer;
     	protected Table table;
     	protected NavigationWidget navigation;
     	protected HashMap<Property, List<String>> lines;
     	Combo structCombo;
     	List<StructuralUnit> availableStructs;
     	PropertiesSelector propSelector;
     	PropertiesSelector structSelector;
     	List<Property> availables;
     	List<Property> selected;
     	TableViewer viewer;
     	Table table;
     	NavigationWidget navigation;
     	HashMap<Property, List<String>> line;
     	protected Label structInfos;
     	protected Composite formPanel;
     	protected Composite navigationPanel;
     	protected Composite resultPanel;
     	Label structInfos;
     	private Composite formPanel;
     	private Composite navigationPanel;
     	private Composite resultPanel;
     	/* (non-Javadoc)
     	 * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
     	 */
-...
     		return false;
+    	}
     	@Override
     	public void computeResult() {
     		final StructuralUnit struct = this.availableStructs.get(this.structCombo.getSelectionIndex());
     	public void updateParameters() {
     		final StructuralUnit struct = internalView.getAvailableStructs().get(this.structCombo.getSelectionIndex());
     		final  List<Property> properties = propSelector.getProperties();
     		final List<StructuralUnitProperty> supList = new ArrayList<StructuralUnitProperty>();
     		List<Property> pList = structSelector.getProperties();
     		List<StructuralUnitProperty> pList = structSelector.getProperties();
     		for (Property property : pList) if (property instanceof StructuralUnitProperty) supList.add((StructuralUnitProperty) property);
     		Integer currentPage = internalView.getCurrentSegmentNo();
     		if (currentPage == null) currentPage = 0;
     		internalView.setParameters(properties, struct, supList, currentPage);
+    	}
     	@Override
     	public void refresh(boolean update) {
     		JobHandler jobhandler = new JobHandler(Messages.InternalViewEditor_1) {
     			@Override
     			protected IStatus run(IProgressMonitor monitor) {
     				this.runInit(monitor);
     				JobsTimer.start();
     				monitor.beginTask(Messages.InternalViewEditor_2, 100);
     				try {
     					if (!(internalView.canCompute() && internalView.isDirty()))
     						return Status.CANCEL_STATUS;
     					internalView.compute(false, monitor);
     					firePropertyChange(PROP_DIRTY); // refresh the dirtiness state
     					line = internalView.getCurrentPage(); // get the first page if pCurrentPage is not set
     					monitor.beginTask(Messages.InternalViewEditor_3, 100);
     					this.syncExec(new Runnable() {
     						@Override
     						public void run() {
     							try {
     								fillResultArea();
     								CorporaView.refresh();
     							} catch (CqiClientException e) {
     								org.txm.rcp.utils.Logger.printStackTrace(e);
+    							}
+    						}
     					});
     				} catch (ThreadDeath td) {
     					return Status.CANCEL_STATUS;
     				} catch(Exception e) {
     					org.txm.rcp.utils.Logger.printStackTrace(e);
     				} finally {
     					monitor.done();
     					JobsTimer.stopAndPrint();
+    				}
     				return Status.OK_STATUS;
+    			}
     		};
     		jobhandler.schedule();
     //		JobHandler jobhandler = new JobHandler(Messages.InternalViewEditor_1) {
     //			@Override
     //			protected IStatus run(IProgressMonitor monitor) {
     //				this.runInit(monitor);
     //				JobsTimer.start();
     //				monitor.beginTask(Messages.InternalViewEditor_2, 100);
     //				try {
     					try {
     						lines = internalView.getCurrentPage();
     						fillResultArea();
     						CorporaView.refresh();
     					} catch (CqiClientException e) {
     						// TODO Auto-generated catch block
     						e.printStackTrace();
     					} // get the first page if pCurrentPage is not set
     //					monitor.beginTask(Messages.InternalViewEditor_3, 100);
     //					this.syncExec(new Runnable() {
     //						@Override
     //						public void run() {
     //							try {
     //							} catch (CqiClientException e) {
     //								org.txm.rcp.utils.Logger.printStackTrace(e);
     //							}
     //						}
     //					});
     //				} catch (ThreadDeath td) {
     //					return Status.CANCEL_STATUS;
     //				} catch(Exception e) {
     //					org.txm.rcp.utils.Logger.printStackTrace(e);
     //				} finally {
     //					monitor.done();
     //					JobsTimer.stopAndPrint();
     //				}
     //				return Status.OK_STATUS;
     //			}
     //		};
     //		jobhandler.schedule();
+    	}
     	public void fillResultArea() throws CqiClientException
+    	{
     		initColumns();
     		viewer.setInput(line);
     		lines = internalView.getCurrentPage();
     		viewer.setInput(lines);
     		viewer.refresh();
     		navigation.setInfoLineText(""+(internalView.getCurrentSegmentNo()+1), internalView.getLocationTail()); //$NON-NLS-1$
-...
     		structComboLabel.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, true));
     		structCombo = new Combo(formPanel, SWT.NONE);
     		structCombo.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, true));
     		structCombo.addSelectionListener(new SelectionListener() {
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				internalView.setStructuralUnit(internalView.getAvailableStructs().get(structCombo.getSelectionIndex()));
     				try {
     					internalView.getFirst();
     					fillResultArea();
     				} catch (CqiClientException e1) {
     					System.out.println("Error: "+e1.getLocalizedMessage());
     					Log.printStackTrace(e1);
+    				}
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {}
     		});
     		propSelector = new PropertiesSelector(formPanel, SWT.NONE);
     		propSelector.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, true));
     		propSelector.setLayout(new GridLayout(3, false));
-...
     			public void widgetSelected(SelectionEvent e) {
     				internalView.setParameters(propSelector.getProperties(), null, null, null);
     				try {
     					line = internalView.getPage(internalView.getCurrentSegmentNo());
     					fillResultArea();
     				} catch (CqiClientException e1) {
     					System.out.println("Error: "+e1.getLocalizedMessage());
-...
     			public void widgetSelected(SelectionEvent e) {
     				ArrayList<StructuralUnitProperty> supList = new ArrayList<StructuralUnitProperty>();
     				for (Property property : structSelector.getProperties()) if (property instanceof StructuralUnitProperty) supList.add((StructuralUnitProperty) property);
     				internalView.setParameters(null, null, supList, null);
     				internalView.setStructuralUnitProperties(supList);
     				try {
     					line = internalView.getPage(internalView.getCurrentSegmentNo());
     					lines = internalView.getCurrentPage();
     					fillResultArea();
     				} catch (CqiClientException e1) {
     					System.out.println("Error: "+e1.getLocalizedMessage());
-...
     			@Override
     			public void widgetSelected(SelectionEvent e) {
     				internalView.setParameters(null,  null, null, 0);
     				computeResult();
     				TXMEditorPart.compute(getResultData(), true, InternalViewEditor.this);
+    			}
     			@Override
     			public void widgetDefaultSelected(SelectionEvent e) {
     				// TODO Auto-generated method stub
+    			}
     			public void widgetDefaultSelected(SelectionEvent e) { }
     		});
     		navigation = new NavigationWidget(navigationPanel, SWT.NONE);
-...
     			public void widgetSelected(SelectionEvent e) {
     				if (internalView != null) {
     					try {
     						line = internalView.getFirst();
     						internalView.getFirst();
     						fillResultArea(); // one segment at time
     						navigation.setFirstEnabled(false);
-...
     			public void widgetSelected(SelectionEvent e) {
     				if (internalView != null) {
     					try {
     						line = internalView.getPrevious();
     						internalView.getPrevious();
     						fillResultArea(); // one segment at time
     						navigation.setFirstEnabled(true);
-...
     			public void widgetSelected(SelectionEvent e) {
     				if (internalView != null) {
     					try {
     						line = internalView.getNext();
     						internalView.getNext();
     						fillResultArea(); // one segment at time
     						navigation.setFirstEnabled(true);
-...
     			public void widgetSelected(SelectionEvent e) {
     				if (internalView != null) {
     					try {
     						line = internalView.getLast();
     						internalView.getLast();
     						fillResultArea(); // one segment at time
     						navigation.setFirstEnabled(true);
-...
     		createContextMenu();
     		computeResult();
     		TXMEditorPart.compute(getResultData(), true, InternalViewEditor.this);
+    	}
     	protected boolean goToPage(int next) throws CqiClientException {
     		line = internalView.getPage(next);
     		lines = internalView.getPage(next);
     		fillResultArea(); // one segment at time
     		if (next == 0) {
-...
+    	}
     	private void reloadStructuralUnitProperties() {
     		StructuralUnit struct = availableStructs.get(structCombo.getSelectionIndex());
     		ArrayList<Property> availables = new ArrayList<Property>(struct.getOrderedProperties());
     		for (int i = 0 ; i < availables.size() ; i++) {
     			String name = availables.get(i).getName();
     			if (name.equals("base") || name.equals("project")) //$NON-NLS-1$ //$NON-NLS-2$
     				availables.remove(i--);
+    		}
     		ArrayList<Property> selected = new ArrayList<Property>();
     		if (availables.size() > 0) {
     			selected.add(availables.remove(0));
+    		}
     		structSelector.setProperties(availables, selected);
     		structSelector.setProperties(internalView.getAvailableStructuralUnitProperties(), internalView.getStructuralUnitProperties());
+    	}
     	HashMap<Property, TableViewerColumn> columns = new HashMap<Property, TableViewerColumn>();
-...
+    	}
     	public String buildQuery() {
     		TableColumn[] cols = viewer.getTable().getColumns();
     		TableItem[] items = viewer.getTable().getItems();
-...
     	protected void initializeFields() {
     		try { // init combos
     			availables = new ArrayList<Property>(corpus.getOrderedProperties());
     			availableStructs = corpus.getStructuralUnits();
     			selected = new ArrayList<Property>();
     			propSelector.setProperties(internalView.getAvailableProperties(), internalView.getProperties());
     			if (internalView.getProperties() != null && internalView.getProperties().size() > 0) {
     				selected = internalView.getProperties();
     				availables.removeAll(selected);
     				propSelector.setProperties(availables, selected);
     			} else {
     				availables.remove(corpus.getProperty("word")); //$NON-NLS-1$
     				selected.add(corpus.getProperty("word")); //$NON-NLS-1$
     				propSelector.setCorpus(corpus);
+    			}
     			if (internalView.getCurrentSegmentNo() != null) {
     				Integer n = internalView.getCurrentSegmentNo();
     				n++;
     				navigation.setInfoLineText(n.toString(), internalView.getLocationTail());
+    			}
     			for (StructuralUnit struct : availableStructs)
     			for (StructuralUnit struct : internalView.getAvailableStructs())
     				structCombo.add(struct.toString());
     			if (availableStructs.size() > 0) {
     			if (internalView.getAvailableStructs().size() > 0) {
     				int hasS = -1;
     				int hasP = -1;
     				for (int i = 0 ; i < availableStructs.size() ; i++) {
     					if (availableStructs.get(i).getName().equals("s")) hasS = i; //$NON-NLS-1$
     					else if (availableStructs.get(i).getName().equals("p")) hasP = i; //$NON-NLS-1$
     				for (int i = 0 ; i < internalView.getAvailableStructs().size() ; i++) {
     					if (internalView.getAvailableStructs().get(i).getName().equals("s")) hasS = i; //$NON-NLS-1$
     					else if (internalView.getAvailableStructs().get(i).getName().equals("p")) hasP = i; //$NON-NLS-1$
+    				}
     				if (hasS > 0) {
-...
     				reloadStructuralUnitProperties();
+    			}
     		} catch (CqiClientException e) {
     		} catch (Exception e) {
     			System.out.println(Messages.InternalViewEditor_10);
     			org.txm.rcp.utils.Logger.printStackTrace(e);
+    		}

     import java.util.List;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.utils.logger.Log;
     // TODO: Auto-generated Javadoc
     /**
-...
     		Collections.sort(props);
     		return props;
+    	}
     	public static List<StructuralUnit> stringToStructuralUnits(Corpus corpus, String v) {
     		ArrayList<StructuralUnit> structs = new ArrayList<StructuralUnit>();
     		if (v == null) return structs;
     		if (v.length() == 0) return structs;
     		String[] split = v.split("\t");
     		for (String s : split) {
     			StructuralUnit struc;
     			try {
     				struc = corpus.getStructuralUnit(s);
     			} catch (CqiClientException e) {
     				System.out.println("Error: "+v+" structure not found in "+corpus);
     				Log.printStackTrace(e);
     				return null;
+    			}
     			if (struc != null) {
     				structs.add(struc);
+    			}
+    		}
     		return structs;
+    	}
+    }

     	/** The strucutral unit. */
     	private StructuralUnit structuralUnit;
     	public static List<StructuralUnitProperty> stringToStructuralUnitProperties(Corpus corpus, String v) {
     		ArrayList<StructuralUnitProperty> structs = new ArrayList<StructuralUnitProperty>();
     		if (v == null) return structs;
     		if (v.length() == 0) return structs;
     		String[] split = v.split("\t");
     		for (String s : split) {
     			String[] split2 = s.split("_", 2);
     			if (split2.length != 2) continue;
     			try {
     				StructuralUnit struc = corpus.getStructuralUnit(split2[0]);
     				StructuralUnitProperty struc_p = struc.getProperty(split2[1]);
     				if (struc_p != null) {
     					structs.add(struc_p);
+    				}
     			} catch (CqiClientException e) {
     				System.out.println("Error: "+v+" structure property not found in "+corpus);
     				Log.printStackTrace(e);
     				return null;
+    			}
+    		}
     		return structs;
+    	}
     	/**
     	 * Instantiates a new structural unit property.
+    	 *

     package org.txm.searchengine.cqp.corpus;
     import java.io.Serializable;
     import java.util.ArrayList;
     import java.util.List;
     import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
     import org.txm.utils.logger.Log;
     /**
      * An abstract CQP corpus property. Represents a <strong>type</strong>, not a the value for a specific unit.
+     *
-...
     	private static final long serialVersionUID = -7769130002380230833L;
     	/**
+    	 *
     	 * @param corpus
     	 * @param v
     	 * @return a list of word properties read from a String
     	 */
     	public static List<Property> stringToProperties(Corpus corpus, String v)  {
     		ArrayList<Property> props = new ArrayList<Property>();
     		if (v == null) return props;
     		if (v.length() == 0) return props;
     		String[] split = v.split("\t");
     		for (String s : split) {
     			Property prop;
     			try {
     				prop = corpus.getProperty(s);
     			} catch (CqiClientException e) {
     				System.out.println("Error: "+v+" property not found in "+corpus);
     				Log.printStackTrace(e);
     				return null;
+    			}
     			if (prop != null) {
     				props.add(prop);
+    			}
+    		}
     		return props;
+    	}
     	/** The name. */
     	protected String name;

     import java.util.List;
     import org.txm.core.messages.TXMCoreMessages;
     import org.txm.searchengine.cqp.corpus.Corpus;
     import org.txm.searchengine.cqp.corpus.Property;
     import org.txm.searchengine.cqp.corpus.StructuralUnit;
     import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
     // TODO: Auto-generated Javadoc
-...
     	private List<Property> properties = new ArrayList<Property>();
     	/**
+    	 *
     	 * @param corpus
     	 * @param v
     	 * @return a list of word and structure properties read from a String
     	 */
     	public static ReferencePattern stringToReferencePattern(Corpus corpus, String v) {
     		try {
     			ReferencePattern props = new ReferencePattern();
     			if (v == null) return props;
     			if (v.length() == 0) return props;
     			String[] split = v.split("\t");
     			for (String s : split) {
     				if (s.contains("_")) {
     					String[] split2 = s.split("_", 2);
     					StructuralUnit su = corpus.getStructuralUnit(split2[0]);
     					if (su != null) {
     						Property prop = su.getProperty(split2[1]);
     						if (prop != null) {
     							props.addProperty(prop);
+    						}
+    					}
     				} else {
     					Property prop = corpus.getProperty(s);
     					if (prop != null) {
     						props.addProperty(prop);
+    					}
+    				}
+    			}
     			return props;
     		} catch (Exception e) {
     			System.out.println("Error: "+v+" property not found in "+corpus);
     			return null;
+    		}
+    	}
     	/**
     	 * Instantiates a new reference pattern.
     	 */
     	public ReferencePattern() {

     /**
      * the dialog box called to select the view properties @ author mdecorde.
      */
     public class ViewPropertySelectionDialog extends Dialog {
     public class ViewPropertySelectionDialog<P extends Property> extends Dialog {
     	/** The available properties. */
     	final private List<Property> availableProperties;
     	final private List<P> availableProperties;
     	/** The selected properties. */
     	final private List<Property> selectedProperties;
     	final private List<P> selectedProperties;
     	/** The maxprops. */
     	int maxprops = -1;
-...
     	 * @param selectedProperties the selected properties
     	 */
     	public ViewPropertySelectionDialog(IShellProvider parentShell,
     			List<Property> availableProperties,
     			List<Property> selectedProperties) {
     			List<P> availableProperties,
     			List<P> selectedProperties) {
     		super(parentShell);
     		this.availableProperties = availableProperties;
-...
     	 * @param selectedProperties the selected properties
     	 */
     	public ViewPropertySelectionDialog(Shell shell,
     			List<Property> availableProperties,
     			List<Property> selectedProperties) {
     			List<P> availableProperties,
     			List<P> selectedProperties) {
     		super(shell);
     		this.availableProperties = availableProperties;
-...
     	 * @param maxprops the maxprops
     	 */
     	public ViewPropertySelectionDialog(Shell shell,
     			List<Property> availableProperties,
     			List<Property> selectedProperties, int maxprops) {
     			List<P> availableProperties,
     			List<P> selectedProperties, int maxprops) {
     		super(shell);
     		this.availableProperties = availableProperties;
-...
+    	 *
     	 * @return the selected properties
     	 */
     	public List<Property> getSelectedProperties() {
     	public List<P> getSelectedProperties() {
     		return selectedProperties;
+    	}
-...
     			public void widgetSelected(SelectionEvent e) {
     				int index = selectedPropertiesView.getSelectionIndex();
     				if (index > 0) {
     					Property selectedP = selectedProperties.get(index);
     					Property upperP = selectedProperties.get(index - 1);
     					P selectedP = selectedProperties.get(index);
     					P upperP = selectedProperties.get(index - 1);
     					selectedProperties.set(index, upperP);
     					selectedProperties.set(index - 1, selectedP);
-...
     			public void widgetSelected(SelectionEvent e) {
     				int index = selectedPropertiesView.getSelectionIndex();
     				if (index < selectedProperties.size() - 1 && index >= 0) {
     					Property selectedP = selectedProperties.get(index);
     					Property bellowP = selectedProperties.get(index + 1);
     					P selectedP = selectedProperties.get(index);
     					P bellowP = selectedProperties.get(index + 1);
     					selectedProperties.set(index, bellowP);
     					selectedProperties.set(index + 1, selectedP);

     package org.txm.rcp.swt.widget;
     import java.util.ArrayList;
     import java.util.Collection;
     import java.util.List;
     import org.eclipse.osgi.util.NLS;
-...
     /**
      * Allow to choose a structural property @ author mdecorde.
      */
     public class PropertiesSelector extends Composite {
     public class PropertiesSelector<P extends Property> extends Composite {
     	/** The corpus. */
     	Corpus corpus;
     	/** The properties. */
     	List<Property> properties;
     	List<P> properties;
     	/** The availableprops. */
     	List<Property> availableprops;
     	List<P> availableprops;
     	/** The maxprops. */
     	int maxprops = -1;
-...
     	 */
     	public void setCorpus(Corpus corpus) {
     		this.corpus = corpus;
     		this.properties = new ArrayList<Property>();
     		this.properties = new ArrayList<P>();
     		if (corpus == null)
     			return;
     		try {
     			availableprops = new ArrayList<Property>();
     			availableprops.addAll(corpus.getOrderedProperties());
     			availableprops = new ArrayList<P>();
     			availableprops.addAll((Collection<? extends P>) corpus.getOrderedProperties());
     			//availableprops.addAll(corpus.getStructuralUnitProperties());
     			for (int i = 0; i < availableprops.size(); i++) {
-...
+    			}
     			if (availableprops.size() > 0) {
     				this.properties = new ArrayList<Property>();
     				this.properties = new ArrayList<P>();
     				for (int i = 0 ; i < availableprops.size() ; i++) {
     					if (availableprops.get(i).getName().equals("word")) { //$NON-NLS-1$
     						properties.add(availableprops.get(i));
-...
+    	 *
     	 * @return the properties
     	 */
     	public List<Property> getProperties() {
     	public List<P> getProperties() {
     		return this.properties;
+    	}
-...
+    	 *
     	 * @return the Available properties
     	 */
     	public List<Property> getAvailableProperties() {
     	public List<P> getAvailableProperties() {
     		return this.availableprops;
+    	}
-...
     	 * @param available the available
     	 * @param selected the selected
     	 */
     	public void setProperties(List<Property> available, List<Property> selected) {
     	public void setProperties(List<P> available, List<P> selected) {
     		// System.out.println("initialize prop selector with: "+available+" and "+selected);
     		availableprops = available;
     		this.properties = selected;
-...
     	public void clear() {
     		setText(""); //$NON-NLS-1$
     		setProperties(new ArrayList<Property>(), new ArrayList<Property>());
     		setProperties(new ArrayList<P>(), new ArrayList<P>());
+    	}
     	ArrayList<Listener> listeners = new ArrayList<Listener>();

Laboratoire ICAR » Plateforme TXM

Révision 543