Révision 1831

tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/SwingChartComposite.java (revision 1831)
11 11
import java.awt.datatransfer.DataFlavor;
12 12
import java.awt.datatransfer.Transferable;
13 13
import java.awt.datatransfer.UnsupportedFlavorException;
14
import java.awt.event.WindowAdapter;
15 14
import java.awt.event.WindowEvent;
15
import java.awt.event.WindowFocusListener;
16
import java.awt.event.WindowListener;
16 17
import java.awt.image.BufferedImage;
17 18
import java.io.IOException;
18 19

  
19 20
import javax.swing.JApplet;
20 21
import javax.swing.JComponent;
21
import javax.swing.SwingUtilities;
22
import javax.swing.border.LineBorder;
22 23

  
23 24
import org.eclipse.swt.awt.SWT_AWT;
24 25
import org.eclipse.swt.widgets.Composite;
......
26 27
import org.txm.chartsengine.rcp.IChartComponent;
27 28
import org.txm.chartsengine.rcp.editors.ChartEditor;
28 29
import org.txm.chartsengine.rcp.events.EventCallBackHandler;
30
import org.txm.core.preferences.TBXPreferences;
31
import org.txm.rcp.preferences.RCPPreferences;
32
import org.txm.utils.logger.Log;
29 33

  
30 34
/**
31 35
 * Base chart composite with Swing/AWT support.
......
78 82
		final JApplet applet = new JApplet(); 
79 83
		this.rootPanel = (JComponent) applet.getRootPane().getContentPane();
80 84
		
81
		
82 85
		this.frame.add(applet);
83 86
		
84 87
		//this.frame.pack();
......
167 170
////			}
168 171
////		});
169 172
//		
170
//		this.frame.addWindowListener(new WindowListener() {
171
//			
172
//			@Override
173
//			public void windowOpened(WindowEvent e) {
174
//				// TODO Auto-generated method stub
175
//				
176
//			}
177
//			
178
//			@Override
179
//			public void windowIconified(WindowEvent e) {
180
//				// TODO Auto-generated method stub
181
//				
182
//			}
183
//			
184
//			@Override
185
//			public void windowDeiconified(WindowEvent e) {
186
//				// TODO Auto-generated method stub
187
//				
188
//			}
189
//			
190
//			@Override
191
//			public void windowDeactivated(WindowEvent e) {
192
//				// TODO Auto-generated method stub
193
//				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowListener() {...}.windowDeactivated()");
194
//			}
195
//			
196
//			@Override
197
//			public void windowClosing(WindowEvent e) {
198
//				// TODO Auto-generated method stub
199
//				
200
//			}
201
//			
202
//			@Override
203
//			public void windowClosed(WindowEvent e) {
204
//				// TODO Auto-generated method stub
205
//				
206
//			}
207
//			
208
//			@Override
209
//			public void windowActivated(WindowEvent e) {
210
//				// TODO Auto-generated method stub
211
//				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowListener() {...}.windowActivated()");
212
//			}
213
//		});
173
		this.frame.addWindowListener(new WindowListener() {
174
			
175
			@Override
176
			public void windowOpened(WindowEvent e) {
177
				// TODO Auto-generated method stub
178
				
179
			}
180
			
181
			@Override
182
			public void windowIconified(WindowEvent e) {
183
				// TODO Auto-generated method stub
184
				
185
			}
186
			
187
			@Override
188
			public void windowDeiconified(WindowEvent e) {
189
				// TODO Auto-generated method stub
190
				
191
			}
192
			
193
			@Override
194
			public void windowDeactivated(WindowEvent e) {
195
				// TODO Auto-generated method stub
196
				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowListener() {...}.windowDeactivated()");
197
			}
198
			
199
			@Override
200
			public void windowClosing(WindowEvent e) {
201
				// TODO Auto-generated method stub
202
				
203
			}
204
			
205
			@Override
206
			public void windowClosed(WindowEvent e) {
207
				// TODO Auto-generated method stub
208
				
209
			}
210
			
211
			@Override
212
			public void windowActivated(WindowEvent e) {
213
				// TODO Auto-generated method stub
214
				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowListener() {...}.windowActivated()");
215
			}
216
		});
217

  
218
		
219
		this.frame.addWindowFocusListener(new WindowFocusListener() {
220
			
221
			@Override
222
			public void windowLostFocus(WindowEvent e) {
223
				// TODO Auto-generated method stub
224
				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowFocusListener() {...}.windowLostFocus()");
225
				
226
				// FIXME: For Swing focus debug tests
227
				if(RCPPreferences.getInstance().getBoolean(TBXPreferences.EXPERT_USER))	{
228
					((JComponent) rootPanel).setBorder(javax.swing.BorderFactory.createEmptyBorder());
229
				}
230

  
231
				
232
			}
233
			
234
			@Override
235
			public void windowGainedFocus(WindowEvent e) {
236
				// TODO Auto-generated method stub
237
				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowFocusListener() {...}.windowGainedFocus()");
238
				
239
				// FIXME: For Swing focus debug tests
240
				if(RCPPreferences.getInstance().getBoolean(TBXPreferences.EXPERT_USER))	{
241
					((JComponent) rootPanel).setBorder(new LineBorder(Color.red, 1));
242
				}
243
	
244
				
245
			}
246
		});
247
		
248
		
214 249
//		
215
//		
216 250
//		this.frame.addFocusListener(new FocusListener() {
217 251
//			
218 252
//			@Override
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java (revision 1831)
2 2

  
3 3

  
4 4
import java.awt.AWTEvent;
5
import java.awt.Color;
6
import java.awt.event.FocusEvent;
7
import java.awt.event.FocusListener;
5
import java.awt.Frame;
8 6
import java.awt.event.MouseEvent;
9 7
import java.awt.event.MouseListener;
10 8
import java.awt.event.MouseMotionListener;
......
15 13
import java.util.Properties;
16 14

  
17 15
import javax.swing.JComponent;
18
import javax.swing.border.LineBorder;
19 16

  
20 17
import org.eclipse.core.commands.ExecutionEvent;
21 18
import org.eclipse.core.runtime.CoreException;
......
23 20
import org.eclipse.core.runtime.Platform;
24 21
import org.eclipse.jface.preference.BooleanFieldEditor;
25 22
import org.eclipse.jface.preference.ComboFieldEditor;
26
import org.eclipse.jface.util.IPropertyChangeListener;
27
import org.eclipse.jface.util.PropertyChangeEvent;
28 23
import org.eclipse.swt.SWT;
29 24
import org.eclipse.swt.graphics.Point;
30 25
import org.eclipse.swt.layout.GridData;
31 26
import org.eclipse.swt.widgets.Composite;
32
import org.eclipse.swt.widgets.Display;
33 27
import org.eclipse.swt.widgets.Event;
34 28
import org.eclipse.swt.widgets.Group;
35 29
import org.eclipse.swt.widgets.Label;
......
58 52
import org.txm.chartsengine.rcp.swt.AdvancedChartEditorToolBar;
59 53
import org.txm.chartsengine.rcp.swt.ChartComposite;
60 54
import org.txm.chartsengine.rcp.swt.ChartEditorToolBar;
61
import org.txm.core.preferences.TBXPreferences;
62 55
import org.txm.core.preferences.TXMPreferences;
63 56
import org.txm.rcp.editors.TXMMultiPageEditor;
64
import org.txm.rcp.preferences.RCPPreferences;
65 57
import org.txm.rcp.preferences.TXMPreferencePage;
66 58
import org.txm.rcp.preferences.TXMPreferenceStore;
67 59
import org.txm.utils.logger.Log;
......
798 790
			@Override
799 791
			public void mouseExited(java.awt.event.MouseEvent e) {
800 792
				// TODO Auto-generated method stub
801

  
793
				Frame frame = (Frame) swingComponent.getFocusCycleRootAncestor();
794
				//frame.setAutoRequestFocus(false);
795
				//frame.setFocusable(false);
796
				//frame.setFocusableWindowState(false);
802 797
			}
803 798

  
804 799
			@Override

Formats disponibles : Unified diff