Révision 3832

TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 3832)
385 385
	
386 386
	
387 387
	public void onPartActivated() {
388
		Log.finest("+++++ ChartEditor.onPartActivated(): " + this.getResult());
388
		Log.finest("+++++ ChartEditor.onPartActivated(): " + this.getResult()); //$NON-NLS-1$
389 389
		this.activateContext();
390 390
	}
391 391
	
392 392
	public void onPartDeactivated() {
393
		Log.finest("----- ChartEditor.onPartDeactivated(): " + this.getResult());
393
		Log.finest("----- ChartEditor.onPartDeactivated(): " + this.getResult()); //$NON-NLS-1$
394 394
		this.deactivateContext();
395 395
	}
396 396
	
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/AdvancedChartEditorToolBar.java (revision 3832)
37 37
 */
38 38
public class AdvancedChartEditorToolBar extends ChartEditorToolBar {
39 39
	
40
	public final static String ID = "AdvancedChartEditorToolBar";
40
	public final static String ID = "AdvancedChartEditorToolBar"; //$NON-NLS-1$
41 41

  
42 42
	/**
43 43
	 * Chart type selection combo (expert mode only).
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/ChartComposite.java (revision 3832)
143 143
		
144 144
		// if (!this.chartEditor.getResult().isChartDirty()) {
145 145
		
146
		Log.finest(this.getClass().getSimpleName() + ": creating a chart component...");
146
		Log.finest(this.getClass().getSimpleName() + ": creating a chart component..."); //$NON-NLS-1$
147 147
		
148 148
		this.chartComponent = this._createChartComponent();
149 149
		this.chartComponent.setChartEditor(this.chartEditor);
......
214 214
	public void setCurrentContextMenu(int index) {
215 215
		
216 216
		// Debug
217
		Log.finest("ChartComposite.setCurrentContextMenu(): setting menu to " + index + " / " + this.contextMenus.get(index)); //$NON-NLS-1$
217
		Log.finest("ChartComposite.setCurrentContextMenu(): setting menu to " + index + " / " + this.contextMenus.get(index)); //$NON-NLS-1$ //$NON-NLS-2$
218 218
		
219 219
		this.setMenu(this.contextMenus.get(index));
220 220
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/ChartEditorToolBar.java (revision 3832)
19 19
public class ChartEditorToolBar extends TXMEditorToolBar {
20 20
	
21 21
	
22
	public final static String ID = "ChartEditorToolBar";
22
	public final static String ID = "ChartEditorToolBar"; //$NON-NLS-1$
23 23
	
24 24
	
25 25
	/**
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/SwingChartComposite.java (revision 3832)
221 221
	public boolean setFocus() {
222 222
		
223 223
		if (this.isDisposed()) {
224
			System.out.println("SwingChartComposite.setFocus(): is disposed.");
224
			System.out.println("SwingChartComposite.setFocus(): is disposed."); //$NON-NLS-1$
225 225
			return false;
226 226
		}
227 227
		
......
424 424
						
425 425
						// setVisible(false);
426 426
						frame.setVisible(false);
427
						Log.finest("SwingChartComposite.initEventsListeners().new MouseListener() {...}.mouseExited()");
427
						Log.finest("SwingChartComposite.initEventsListeners().new MouseListener() {...}.mouseExited()"); //$NON-NLS-1$
428 428
						frame.setVisible(true);
429 429
						// setVisible(true);
430 430
						
......
696 696
			@Override
697 697
			public void focusLost(FocusEvent e) {
698 698
				// TODO Auto-generated method stub
699
				Log.finest("SwingChartComposite.SwingChartComposite(...).new FocusListener() {...}.focusLost()");
699
				Log.finest("SwingChartComposite.SwingChartComposite(...).new FocusListener() {...}.focusLost()"); //$NON-NLS-1$
700 700
			}
701 701
			
702 702
			@Override
703 703
			public void focusGained(FocusEvent e) {
704 704
				// TODO Auto-generated method stub
705
				Log.finest("SwingChartComposite.SwingChartComposite(...).new FocusListener() {...}.focusGained()");
705
				Log.finest("SwingChartComposite.SwingChartComposite(...).new FocusListener() {...}.focusGained()"); //$NON-NLS-1$
706 706
			}
707 707
		});
708 708
		
......
794 794
			@Override
795 795
			public void windowDeactivated(WindowEvent e) {
796 796
				// TODO Auto-generated method stub
797
				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowListener() {...}.windowDeactivated()");
797
				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowListener() {...}.windowDeactivated()"); //$NON-NLS-1$
798 798
			}
799 799
			
800 800
			@Override
......
812 812
			@Override
813 813
			public void windowActivated(WindowEvent e) {
814 814
				// TODO Auto-generated method stub
815
				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowListener() {...}.windowActivated()");
815
				Log.finest("SwingChartComposite.SwingChartComposite(...).new WindowListener() {...}.windowActivated()"); //$NON-NLS-1$
816 816
			}
817 817
		});
818 818
		
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ZoomOutChartView.java (revision 3832)
7 7
import org.eclipse.swt.graphics.Point;
8 8
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
9 9
import org.txm.chartsengine.rcp.editors.ChartEditor;
10
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
10 11
import org.txm.utils.logger.Log;
11 12

  
12 13
/**
......
27 28
			chartEditor.zoom(p.x / 2, p.y / 2, false);
28 29
		}
29 30
		catch (Exception e) {
30
			Log.warning(NLS.bind("Error while zooming out in {0}: {1}.", chartEditor, e));
31
			Log.warning(NLS.bind(ChartsUIMessages.ErrorWhileZoomingOutInP0P1, chartEditor, e));
31 32
		}
32 33
		return chartEditor;
33 34
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/CopyChartViewToClipboard.java (revision 3832)
6 6
import org.txm.chartsengine.core.results.ChartResult;
7 7
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
8 8
import org.txm.chartsengine.rcp.editors.ChartEditor;
9
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
9 10
import org.txm.utils.logger.Log;
10 11

  
11 12
/**
......
22 23
		ChartEditor<? extends ChartResult> chartEditor = SWTChartsComponentsProvider.getActiveChartEditor(event);
23 24
		chartEditor.copyChartViewToClipboard();
24 25
		
25
		Log.info("Chart view copied to clipboard.");
26
		Log.info(ChartsUIMessages.ChartViewCopiedToClipboard);
26 27
		
27 28
		return null;
28 29
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/MoveDownChartView.java (revision 3832)
6 6
import org.eclipse.osgi.util.NLS;
7 7
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
8 8
import org.txm.chartsengine.rcp.editors.ChartEditor;
9
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
9 10
import org.txm.utils.logger.Log;
10 11

  
11 12
/**
......
25 26
			chartEditor.pan(0, 0, 0, -1, 0.1);
26 27
		}
27 28
		catch (Exception e) {
28
			Log.warning(NLS.bind("Error while moving down in {0}: {1}.", chartEditor, e));
29
			Log.warning(NLS.bind(ChartsUIMessages.ErrorWhileMovingDownInP0P1, chartEditor, e));
29 30
		}
30 31
		return chartEditor;
31 32
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/MoveLeftChartView.java (revision 3832)
6 6
import org.eclipse.osgi.util.NLS;
7 7
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
8 8
import org.txm.chartsengine.rcp.editors.ChartEditor;
9
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
9 10
import org.txm.utils.logger.Log;
10 11

  
11 12
/**
......
25 26
			chartEditor.pan(0, 0, -1, 0, 0.1);
26 27
		}
27 28
		catch (Exception e) {
28
			Log.warning(NLS.bind("Error while moving to the left in {0}: {1}.", chartEditor, e));
29
			Log.warning(NLS.bind(ChartsUIMessages.ErrorWhileMovingToTheLeftInP0P1, chartEditor, e));
29 30
		}
30 31
		return chartEditor;
31 32
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ResetChartView.java (revision 3832)
7 7
import org.txm.chartsengine.core.results.ChartResult;
8 8
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
9 9
import org.txm.chartsengine.rcp.editors.ChartEditor;
10
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
10 11
import org.txm.utils.logger.Log;
11 12

  
12 13
/**
......
25 26
			chartEditor.resetView();
26 27
		}
27 28
		catch (Exception e) {
28
			Log.warning(NLS.bind("Error while resetting view in {0}: {1}.", chartEditor, e));
29
			Log.warning(NLS.bind(ChartsUIMessages.ErrorWhileResettingViewInP0P1, chartEditor, e));
29 30
		}
30 31
		return chartEditor;
31 32
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/MoveRightChartView.java (revision 3832)
6 6
import org.eclipse.osgi.util.NLS;
7 7
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
8 8
import org.txm.chartsengine.rcp.editors.ChartEditor;
9
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
9 10
import org.txm.utils.logger.Log;
10 11

  
11 12
/**
......
25 26
			chartEditor.pan(0, 0, 1, 0, 0.1);
26 27
		}
27 28
		catch (Exception e) {
28
			Log.warning(NLS.bind("Error while moving to the right in {0}: {1}.", chartEditor, e));
29
			Log.warning(NLS.bind(ChartsUIMessages.ErrorWhileMmovingTotherightInP0P1, chartEditor, e));
29 30
		}
30 31
		return chartEditor;
31 32
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java (revision 3832)
44 44
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
45 45
import org.txm.chartsengine.core.results.ChartResult;
46 46
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
47
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
47 48
import org.txm.core.preferences.TBXPreferences;
48 49
import org.txm.rcp.JobsTimer;
49 50
import org.txm.rcp.StatusLine;
......
109 110
		dialog.setFileName(chartResult.getValidFileName());
110 111
		
111 112
		if (dialog.open() != null) {
112
			StatusLine.setMessage("Exporting chart...");
113
			StatusLine.setMessage(ChartsUIMessages.ExportingChart);
113 114
			
114 115
			String filepath = dialog.getFilterPath() + "/" + dialog.getFileName(); //$NON-NLS-1$
115 116
			final File file = new File(filepath);
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java (revision 3832)
46 46
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
47 47
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
48 48
import org.txm.chartsengine.rcp.editors.ChartEditor;
49
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
49 50
import org.txm.core.messages.TXMCoreMessages;
50 51
import org.txm.core.preferences.TBXPreferences;
51 52
import org.txm.rcp.JobsTimer;
......
122 123
				Log.severe(TXMCoreMessages.bind(TXMUIMessages.impossibleToReadP0, file));
123 124
			}
124 125
			if (!file.isFile()) {
125
				Log.severe(TXMCoreMessages.bind("Error: {0} is not a file.", file));
126
				Log.severe(TXMCoreMessages.bind(ChartsUIMessages.ErrorP0IsNotAFile, file));
126 127
			}
127 128
			
128
			JobHandler jobhandler = new JobHandler(TXMCoreMessages.bind("Exporting current chart view to file {0}...", file.getAbsolutePath())) {
129
			JobHandler jobhandler = new JobHandler(TXMCoreMessages.bind(ChartsUIMessages.ExportingCurrentChartViewToFileP0, file.getAbsolutePath())) {
129 130
				
130 131
				@Override
131 132
				protected IStatus run(IProgressMonitor monitor) {
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/MoveUpChartView.java (revision 3832)
6 6
import org.eclipse.osgi.util.NLS;
7 7
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
8 8
import org.txm.chartsengine.rcp.editors.ChartEditor;
9
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
9 10
import org.txm.utils.logger.Log;
10 11

  
11 12
/**
......
25 26
			chartEditor.pan(0, 0, 0, 1, 0.1);
26 27
		}
27 28
		catch (Exception e) {
28
			Log.warning(NLS.bind("Error while moving up in {0}: {1}.", chartEditor, e));
29
			Log.warning(NLS.bind(ChartsUIMessages.ErrorWhileMovingUpInP0P1, chartEditor, e));
29 30
		}
30 31
		return chartEditor;
31 32
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ZoomInChartView.java (revision 3832)
7 7
import org.eclipse.swt.graphics.Point;
8 8
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
9 9
import org.txm.chartsengine.rcp.editors.ChartEditor;
10
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
10 11
import org.txm.utils.logger.Log;
11 12

  
12 13
/**
......
27 28
			chartEditor.zoom(p.x / 2, p.y / 2, true);
28 29
		}
29 30
		catch (Exception e) {
30
			Log.warning(NLS.bind("Error while zooming in in {0}: {1}.", chartEditor, e));
31
			Log.warning(NLS.bind(ChartsUIMessages.ErrorWhileZoomingInP0P1, chartEditor, e));
31 32
		}
32 33
		return chartEditor;
33 34
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/___KeyboardBindingProperties.java (revision 3832)
13 13
public class ___KeyboardBindingProperties extends Properties {
14 14

  
15 15
	
16
	public final static String PAN_LEFT = "charts_engine_keyboard_binding_pan_left", PAN_DOWN = "charts_engine_keyboard_binding_pan_down",  PAN_RIGHT = "charts_engine_keyboard_binding_pan_right",
17
			PAN_UP = "charts_engine_keyboard_binding_pan_up";
16
	public final static String PAN_LEFT = "charts_engine_keyboard_binding_pan_left", PAN_DOWN = "charts_engine_keyboard_binding_pan_down",  PAN_RIGHT = "charts_engine_keyboard_binding_pan_right", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
17
			PAN_UP = "charts_engine_keyboard_binding_pan_up"; //$NON-NLS-1$
18 18
	
19 19

  
20 20

  
......
31 31
	 * Creates a keyboard controls binding with default properties.
32 32
	 */
33 33
	public ___KeyboardBindingProperties() {
34
		this.setProperty(___KeyboardBindingProperties.PAN_LEFT, "");
35
		this.setProperty(___KeyboardBindingProperties.PAN_DOWN, "");
36
		this.setProperty(___KeyboardBindingProperties.PAN_RIGHT, "");
37
		this.setProperty(___KeyboardBindingProperties.PAN_UP, "");
34
		this.setProperty(___KeyboardBindingProperties.PAN_LEFT, ""); //$NON-NLS-1$
35
		this.setProperty(___KeyboardBindingProperties.PAN_DOWN, ""); //$NON-NLS-1$
36
		this.setProperty(___KeyboardBindingProperties.PAN_RIGHT, ""); //$NON-NLS-1$
37
		this.setProperty(___KeyboardBindingProperties.PAN_UP, ""); //$NON-NLS-1$
38 38
	}
39 39

  
40 40

  
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/___MouseBindingProperties.java (revision 3832)
13 13
public class ___MouseBindingProperties extends Properties {
14 14

  
15 15
	
16
	public final static String PAN = "charts_engine_mouse_binding_pan", ZOOM = "charts_engine_mouse_binding_zoom";
16
	public final static String PAN = "charts_engine_mouse_binding_pan", ZOOM = "charts_engine_mouse_binding_zoom"; //$NON-NLS-1$ //$NON-NLS-2$
17 17

  
18 18
	
19 19
	/**
......
28 28
	 * Creates a mouse controls binding with default properties.
29 29
	 */
30 30
	public ___MouseBindingProperties() {
31
		this.setProperty(___MouseBindingProperties.PAN, "");
31
		this.setProperty(___MouseBindingProperties.PAN, ""); //$NON-NLS-1$
32 32
	}
33 33

  
34 34
}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java (revision 3832)
185 185
				
186 186
				SWTChartsComponentsProvider.chartsComponentsProviders.add(swtChartsComponentsProvider);
187 187
				
188
				Log.fine(TXMCoreMessages.bind("Starting SWT charts components provider: {0}...", swtChartsComponentsProvider));
188
				Log.fine(TXMCoreMessages.bind("Starting SWT charts components provider: {0}...", swtChartsComponentsProvider)); //$NON-NLS-1$
189 189
				
190 190
				
191 191
			}
......
218 218
				SWTChartsComponentsProvider.chartsComponentsProviders.get(i).setChartsEngine(chartsEngine);
219 219
				
220 220
				SWTChartsComponentsProvider.currentChartsComponentsProviderIndex = i;
221
				Log.finest("Setting current SWT charts components provider to: " + SWTChartsComponentsProvider.getCurrent() + ".");
221
				Log.finest("Setting current SWT charts components provider to: " + SWTChartsComponentsProvider.getCurrent() + "."); //$NON-NLS-1$ //$NON-NLS-2$
222 222
				break;
223 223
			}
224 224
		}
......
490 490
	
491 491
	@Override
492 492
	public String toString() {
493
		return String.format("%s (supported input formats: %s, Charts Engine: %s)", this.name, this.supportedInputFormats.toString().replaceAll("\\[|\\]", ""), this.chartsEngine); //$NON-NLS-1$
493
		return String.format("%s (supported input formats: %s, Charts Engine: %s)", this.name, this.supportedInputFormats.toString().replaceAll("\\[|\\]", ""), this.chartsEngine); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
494 494
	}
495 495
	
496 496
	
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/ChartsUIMessages.java (revision 3832)
37 37

  
38 38
	public static String multipleLineStrokeStyles;
39 39

  
40
	public static String canNotOpenChartPropertiesInterfaceForThecurrentChartEngine; 
40
	public static String canNotOpenChartPropertiesInterfaceForThecurrentChartEngine;
41

  
42
	public static String ChartViewCopiedToClipboard;
43

  
44
	public static String ErrorP0IsNotAFile;
45

  
46
	public static String ErrorWhileMmovingTotherightInP0P1;
47

  
48
	public static String ErrorWhileMovingDownInP0P1;
49

  
50
	public static String ErrorWhileMovingToTheLeftInP0P1;
51

  
52
	public static String ErrorWhileMovingUpInP0P1;
53

  
54
	public static String ErrorWhileResettingViewInP0P1;
55

  
56
	public static String ErrorWhileZoomingInP0P1;
57

  
58
	public static String ErrorWhileZoomingOutInP0P1; 
41 59
	
42 60
	
43 61
	
44
	static {
62
	
63

  
64
	public static String ExportingChart;
65

  
66
	public static String ExportingCurrentChartViewToFileP0;static {
45 67
		// initialize resource bundle
46 68
		Utf8NLS.initializeMessages(BUNDLE_NAME, ChartsUIMessages.class);
47 69
	}
TXM/trunk/bundles/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages.properties (revision 3832)
3 3
blackAndWhite=Black and white
4 4
canNotOpenChartPropertiesInterfaceForThecurrentChartEngine=Can not open chart properties interface for the current chart engine.
5 5
chartsRendering=Charts rendering
6
ChartViewCopiedToClipboard=Chart view copied to clipboard.
6 7
colors=Colors
7 8
currentEngine=Current charts engine
8 9
defaultExportFormat=Default export format
9 10
displayFormat=Display format
11
ErrorP0IsNotAFile=Error: {0} is not a file.
12
ErrorWhileMmovingTotherightInP0P1=Error while moving to the right in {0}: {1}.
13
ErrorWhileMovingDownInP0P1=Error while moving down in {0}: {1}.
14
ErrorWhileMovingToTheLeftInP0P1=Error while moving to the left in {0}: {1}.
15
ErrorWhileMovingUpInP0P1=Error while moving up in {0}: {1}.
16
ErrorWhileResettingViewInP0P1=Error while resetting view in {0}: {1}.
17
ErrorWhileZoomingInP0P1=Error while zooming in {0}: {1}.
18
ErrorWhileZoomingOutInP0P1=Error while zooming out in {0}: {1}.
19
ExportingChart=Exporting chart...
20
ExportingCurrentChartViewToFileP0=Exporting current chart view to file {0}...
10 21
grayscale=Shades of grey
11 22
monochrome=Monochrome
12 23
monochromeRenderingColor=Color for monochrome rendering

Formats disponibles : Unified diff