Révision 1817

tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/SwingChartComposite.java (revision 1817)
327 327
		
328 328
	}
329 329
	
330
//	@Override
331
//	public boolean setFocus() {
332
//
333
//		if (this.isDisposed()) {
334
//			return false;
335
//		}
336
//		
337
//		// Debug
338
//		Log.finest("SwingChartComposite.setFocus(): trying to give focus to SWT composite and AWT component..."); //$NON-NLS-1$
339
//		
340
//		boolean focusState = super.setFocus();
341
//		
342
//		// Debug
343
//		Log.finest(TXMCoreMessages.bind("SwingChartComposite.setFocus(): SWT composite focus given state = {0}.", this.isFocusControl())); //$NON-NLS-1$
344
//		
345
//		//this.requestFocusInChartComponent();
346
//		
347
//		return focusState;
348
//	}
330
	@Override
331
	public boolean setFocus() {
332

  
333
		if (this.isDisposed()) {
334
			return false;
335
		}
336
		
337
		// Debug
338
		Log.finest("SwingChartComposite.setFocus(): trying to give focus to SWT composite and AWT component..."); //$NON-NLS-1$
339
		
340
		boolean focusState = super.setFocus();
341
		
342
		// Debug
343
		Log.finest(TXMCoreMessages.bind("SwingChartComposite.setFocus(): SWT composite focus given state = {0}.", this.isFocusControl())); //$NON-NLS-1$
344
		
345
		this.requestFocusInChartComponent();
346
		
347
		return focusState;
348
	}
349 349
	
350
//	@Override
351
//	public void requestFocusInChartComponent()	{
352
//		
353
//		
354
////		if(chartComponent != null) {
355
////		
356
////		EventQueue.invokeLater(new Runnable () {
357
////			public void run () {
358
////				if(!((Component) chartComponent).isFocusOwner())	{
359
////					
360
////					//boolean focusState = ((Component) chartComponent).requestFocusInWindow();
361
////					//((Component) chartComponent).requestFocus();
362
////					((JComponent) chartComponent).grabFocus();
363
////					
364
////					// Debug
365
////					Log.finest(TXMCoreMessages.bind("SwingChartComposite.requestFocusInChartComponent(): AWT component focus given state = {0}.", ((Component) chartComponent).isFocusOwner())); //$NON-NLS-1$
366
////					
367
//////					// FIXME: For Swing focus debug tests
368
//////					if(RCPPreferences.getInstance().getBoolean(TBXPreferences.EXPERT_USER))	{
369
//////						if(((Component) chartComponent).isFocusOwner())	{
370
//////							((JComponent) chartComponent).setBorder(new LineBorder(Color.red, 1));
371
//////						}
372
//////						else	{
373
//////							((JComponent) chartComponent).setBorder(javax.swing.BorderFactory.createEmptyBorder());
374
//////						}
375
//////					}
376
////					
377
////					
378
////				}
379
////			}
380
////		});
381
////		
382
////		}
383
//	}
350
	public void requestFocusInChartComponent()	{
351
		
352
		
353
		if(chartComponent != null) {
354
		
355
		EventQueue.invokeLater(new Runnable () {
356
			public void run () {
357
				if(!((Component) chartComponent).isFocusOwner())	{
358
					
359
					//boolean focusState = ((Component) chartComponent).requestFocusInWindow();
360
					//((Component) chartComponent).requestFocus();
361
					((JComponent) chartComponent).grabFocus();
362
					
363
					// Debug
364
					Log.finest(TXMCoreMessages.bind("SwingChartComposite.requestFocusInChartComponent(): AWT component focus given state = {0}.", ((Component) chartComponent).isFocusOwner())); //$NON-NLS-1$
365
					
366
//					// FIXME: For Swing focus debug tests
367
//					if(RCPPreferences.getInstance().getBoolean(TBXPreferences.EXPERT_USER))	{
368
//						if(((Component) chartComponent).isFocusOwner())	{
369
//							((JComponent) chartComponent).setBorder(new LineBorder(Color.red, 1));
370
//						}
371
//						else	{
372
//							((JComponent) chartComponent).setBorder(javax.swing.BorderFactory.createEmptyBorder());
373
//						}
374
//					}
375
					
376
					
377
				}
378
			}
379
		});
380
		
381
		}
382
	}
384 383

  
385 384
	
386 385
	

Formats disponibles : Unified diff