Revision 1837

tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java (revision 1837)
543 543
	
544 544
	@Override
545 545
	public void setFocus() {
546
		// FIXME:SJ:  this code break the synchronized link with concordance and edition => the arrow navigation doesn't work since the focus of the chart composite is lost
547
//		if (queryWidget != null && !queryWidget.isDisposed()) {
548
//			queryWidget.setFocus();
549
//		}
550
		//super.setFocus();
546
		// Give the focus to the query widget only if the result has not yet been computed (otherwise it breaks the synchronous Concordance/Edition)
547
		if(!this.getResult().hasBeenComputedOnce())	{
548
			if (queryWidget != null && !queryWidget.isDisposed()) {
549
				queryWidget.setFocus();
550
			}
551
		}
552
		else	{
553
			super.setFocus();
554
		}
551 555
	}
552 556

  
553 557
	/**
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java (revision 1837)
240 240
	 * @return
241 241
	 */
242 242
	public boolean createChartComponent(ChartEditorInput chartEditorInput)	{
243
		Log.finest(this.getClass().getName() + ": creating a chart component...");
243
		Log.finest(this.getClass().getSimpleName() + ": creating a chart component...");
244 244
		return this.createChartComponent(this.getChartsEngine(), chartEditorInput);
245 245
	}
246 246
	
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 1837)
405 405
	public void setFocus() {
406 406
		
407 407
		//this.getEditorSite().getShell().setActive();
408
		this.parent.setFocus(); // FIX for Windows, useless on Linux, AND to check on Mac OS X
408
		this.parent.setFocus();
409 409
		super.setFocus();
410 410
		// Debug
411 411
		Log.finest("ChartEditor.setFocus(): giving focus to chart composite..."); //$NON-NLS-1$

Also available in: Unified diff