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

tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java (revision 1404)
1130	1130	}
1131	1131
1132	1132	this.nLines = queryResult.getNMatch();
	1133	this.setAltered();
1133	1134	return c > 0;
1134	1135	}
1135	1136	return false;

     import org.eclipse.core.runtime.Status;
     import org.eclipse.core.runtime.jobs.Job;
     import org.eclipse.jface.action.MenuManager;
     import org.eclipse.jface.dialogs.MessageDialog;
     import org.eclipse.jface.viewers.ISelectionProvider;
     import org.eclipse.jface.viewers.IStructuredSelection;
     import org.eclipse.jface.viewers.StructuredSelection;
-...
     		StatusLine.setMessage(TXMCoreMessages.bind(TXMUIMessages.computing, this.getResult().getName()));
     		JobHandler job = new JobHandler(TXMCoreMessages.bind(TXMUIMessages.computing, this.getResult().getName())) {
     			@Override
-...
     				try {
     					JobsTimer.start();
     					this.syncExec(new Runnable() {
     						@Override
     						public void run() {
     							if(update)	{
     								if (TXMEditor.this.getResult().isAltered()) {
     									if (!MessageDialog.openQuestion(Display.getCurrent().getActiveShell(), "Warning", "The result have been edited. Changes will be lost. Do you want to continue?")) {
     										setCanceled(true);
+    									}
+    								}
     								// FIXME: DEbug
     								Log.finest("TXMEditor.compute(): " + TXMEditor.this.getClass().getSimpleName() + ": manually updating result from editor."); //$NON-NLS-1$
     								updateResultFromEditor(); // subclasses manual result updating from editor fields
-...
+    						}
     					});
     					if (this.isCanceled()) {
     						return Status.CANCEL_STATUS;
+    					}
     					// computing result
     					monitor.beginTask(TXMUIMessages.computing_3, 100);
     					notifyExtensions("notifyStartOfCompute"); //$NON-NLS-1$
     					notifyExtensions("notifyStartOfCompute"); //$NON-NLS-1$
     					//if (!update || RCPPreferences.getInstance().getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR)) {
     						if (!TXMEditor.this.getResult().compute(monitor)) {
     							Log.severe("TXMEditor.compute(): " + TXMEditor.this.getClass().getSimpleName() + ": computing failed.");

     		String tmp = "TMP" + CQPCorpus.getNextSubcorpusCounter();
     		String qtmp = corpus.getMainCorpus().getQualifiedCqpId()+":"+tmp;
     		try {
     			System.out.println("subcorpus: "+corpus.getQualifiedCqpId());
     			System.out.println("query subcorpus: "+qtmp);
     //			System.out.println("subcorpus: "+corpus.getQualifiedCqpId());
     //			System.out.println("query subcorpus: "+qtmp);
     			cqi.cqpQuery(corpus.getQualifiedCqpId(), tmp, "[]");
     			fdist = CorpusManager.getCorpusManager().getCqiClient().fdist1(qtmp, 0, ICqiClient.CQI_CONST_FIELD_MATCH, property.getName());
     			//System.out.println("nb lines: "+fdist.length);
-...
     			lexicon.setProperty(property);
     			lexicon._compute();
+    		}
     		System.out.println("Lexicon="+lexicon+" "+lexicon.hashCode());
     		//System.out.println("Lexicon="+lexicon+" "+lexicon.hashCode());
     		return lexicon;
+    	}

     	 * if frozen, the result is not updated when computed
     	 */
     	protected boolean frozen = false;
     	/**
     	 * if a method changed the internal data without **recomputing** the result, the result must be marked "altered"
     	 */
     	protected boolean altered = false;
     	/**
     	 * The result parent. Should not be null except for roots TXMResult
-...
     	// But this stack is also the start for an UNDO command on TXMResult.
     	protected ArrayList<HashMap<String, Object>> parametersHistory = new ArrayList<HashMap<String, Object>>();
     	/**
     	 * Internal persistable state.
     	 */
-...
+    	}
     	/**
     	 * @return true is the internal data has been modified
     	 */
     	public boolean isAltered() {
     		return altered;
+    	}
     	/**
     	 * Mark the result as altered -> modifications are lost after a re-compute
     	 */
     	public void setAltered() {
     		this.altered = true;
+    	}
     	/**
     	 * Freezes the result -> cannot be recomputed.
     	 */
     	public void freeze() {
-...
     		// no changes to do
     		// FIXME: SJ: we need to do do some actions even if the object is frozen, eg. updating parameters, saving parameters, etc.
     		// FIXME MD: nope the parameters must not move and will be saved in the current state
     		if (hasBeenComputedOnce && frozen) {
     			return true;
+    		}
-...
+    				}
     				this.dirty = false; // the computing was successful, the result is no more dirty
     				this.hasBeenComputedOnce = true;
     				this.hasBeenComputedOnce = true;
     				if (altered) {
     					System.out.println(NLS.bind("Warning {0} modifications have been lost.", this.getSimpleName()));
+    				}
     				this.altered = false;
     				Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing of result type " + this.getClass() + " done.");
     				// set the children as dirty since the result has changed

     							// keep only the first col
     							List<Integer> coltodelete = colindices.subList(1, colindices.size());
     							lexicalTable.getData().removeCols(coltodelete);
     							lexicalTable.setAltered();
     							// refresh stuff
     							collist = new ArrayList<Object>();// update col name
     							// list
-...
     							MergeLines.mergeLines(LexicalTableEditor.this, d.getMergeName(), rowindices);
     						} else {
     							lexicalTable.getData().removeRows(rowindices);
     							lexicalTable.setAltered();
     							refreshTable(true);
     							viewer.getTable().deselectAll();
+    						}
-...
     	public void importData(File file) {
     		try {
     			if (lexicalTable.getData().importData(file)) {
     				lexicalTable.setAltered();
     				// fix col names
     				String[] colnames = lexicalTable.getColNames().asStringsArray();
     				TableColumn[] cols = viewer.getTable().getColumns();
-...
+    		}
+    	}
     		/**
     		 * Sort.
+    		 *

     		mergeRadio = new Button(mainArea, SWT.RADIO);
     		mergeRadio.setText(TXMUIMessages.merge);
     		mergeRadio.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false,
 , 1));
     		mergeRadio.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
     		mergeRadio.setSelection(true);
     		deleteRadio = new Button(mainArea, SWT.RADIO);
     		deleteRadio.setText(TXMCoreMessages.common_delete);
     		deleteRadio.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false,
 , 1));
     		deleteRadio.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
     		newname = new Text(mainArea, SWT.SINGLE | SWT.BORDER);
     		newname.setText(TXMUIMessages.mergeResultName);
     		newname.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 4,
 ));
     		newname.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 4, 1));
     		return mainArea;
+    	}

     		System.arraycopy(selection, 1, lineToDelete, 0, selection.length - 1);
     		//System.out.println("Lines to delete : "+Arrays.toString(lineToDelete));
     		table.getData().removeRows(lineToDelete);
     		table.setAltered();
     		// reset line name
     		try {
     			table.getRowNames().setString(selection[0], newname);

+    		}
     		LTeditor.getLexicalTable().getData().removeRows(selection);
     		LTeditor.getLexicalTable().setAltered();
     		LTeditor.refreshTable();
     		LTeditor.getlineTableViewer().getTable().deselectAll();
     		try {

     			System.arraycopy(selectedCols, 1, coltodelete, 0,
     					selectedCols.length - 1);
     			table.getData().removeCols(coltodelete);
     			table.setAltered();
     			// reset col name
     			table.getColNames().setString(selectedCols[0], newname);
     			try {

Laboratoire ICAR » Plateforme TXM

Révision 1404