Revision 1470

tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/adapters/LexicalTableAdapterFactory.java (revision 1470)
2 2
package org.txm.lexicaltable.rcp.adapters;
3 3

  
4 4
import org.eclipse.jface.resource.ImageDescriptor;
5
import org.eclipse.ui.model.IWorkbenchAdapter;
6 5
import org.eclipse.ui.plugin.AbstractUIPlugin;
7 6
import org.osgi.framework.FrameworkUtil;
8 7
import org.txm.lexicaltable.core.functions.LexicalTable;
tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java (revision 1470)
224 224
				}
225 225
				chartCreator = ChartsEngine.getChartsEngines().get(i).getChartCreator(this);
226 226
				if(chartCreator != null)	{
227
					Log.severe("ChartResult.renderChart(): another suitable chart creator has been found in charts engine: " + ChartsEngine.getChartsEngines().get(i) + "."); //$NON-NLS-1$
227
					Log.finest("ChartResult.renderChart(): another suitable chart creator has been found in charts engine: " + ChartsEngine.getChartsEngines().get(i) + "."); //$NON-NLS-1$
228 228
					this.chartsEngine = ChartsEngine.getChartsEngines().get(i);
229 229
					break;
230 230
				}
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 1470)
133 133
		//TODO MD: hack ?
134 134
		//this.resultArea.dispose();
135 135
		
136
		
136 137
		// Chart composite
137
		this.chartComposite = SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()).createComposite(this, getResultArea());
138
		this.chartComposite = SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()).createComposite(this, this.getResultArea());
138 139
		
139 140
		GridData gd = new GridData(GridData.FILL_BOTH);
140
//		gd.grabExcessVerticalSpace = true;
141
//		gd.grabExcessHorizontalSpace = true;
142
		//gd.horizontalSpan = 2; // 2 for match the command parameters toolbar AND the chart toolbar
141
////		gd.grabExcessVerticalSpace = true;
142
////		gd.grabExcessHorizontalSpace = true;
143
//		//gd.horizontalSpan = 2; // 2 for match the command parameters toolbar AND the chart toolbar
143 144
		this.chartComposite.setLayoutData(gd);
145

  
146
		//this.chartComposite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_RED));
144 147
		
148
		//this.getResultArea().setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_YELLOW));
145 149
		
150
		//this.parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_RED));
151
		
146 152
		// Re-add the bottom toolbar
147 153
		//TODO MD: hack ?
148 154
		//this.bottomToolBar = new TXMEditorToolBar(this, SWT.FLAT, "bottom");
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/SwingChartComposite.java (revision 1470)
4 4
package org.txm.chartsengine.rcp.swt;
5 5

  
6 6
import java.awt.BorderLayout;
7
import java.awt.Color;
7 8
import java.awt.Component;
8 9
import java.awt.EventQueue;
9 10
import java.awt.Frame;
......
18 19

  
19 20
import javax.swing.JPanel;
20 21

  
22
import org.eclipse.swt.SWT;
21 23
import org.eclipse.swt.awt.SWT_AWT;
22 24
import org.eclipse.swt.widgets.Composite;
23 25
import org.txm.chartsengine.core.results.ChartResult;
......
71 73
		this.frame.add(this.rootPanel);
72 74

  
73 75
		//this.frame.pack();
76

  
74 77
		this.frame.setVisible(true);
75 78

  
79

  
80
		this.rootPanel.setBackground(Color.WHITE);
81
		
76 82
	}
77 83

  
78 84
	// FIXME: old version; to remove if all ok
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/SetTXMResultPersistentState.java (revision 1470)
72 72
			TXMResult result = ((TXMResult)object);
73 73
			result.swapUserPersistableState();
74 74
			
75
			CorporaView.refresh();
75
			CorporaView.refreshObject(result);
76
			//CorporaView.refresh();
76 77
			return null;
77 78
		}
78 79
		else	{
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/SetTXMResultLockState.java (revision 1470)
33 33
import org.eclipse.core.commands.ExecutionException;
34 34
import org.eclipse.ui.commands.IElementUpdater;
35 35
import org.eclipse.ui.menus.UIElement;
36
import org.txm.core.preferences.TXMPreferences;
37 36
import org.txm.core.results.TXMResult;
38 37
import org.txm.rcp.handlers.BaseAbstractHandler;
39 38
import org.txm.rcp.views.corpora.CorporaView;
......
56 55
			result.setLocked(!result.isLocked());
57 56
			
58 57
			CorporaView.refreshObject(result);
58
			
59 59
			return null;
60 60
		}
61 61
		else	{
......
64 64
	}
65 65

  
66 66
	/**
67
	 * Display the checked mark in the menu item when the menu is created
67
	 * Displays the checked mark in the menu item when the menu is created.
68 68
	 */
69 69
	@Override
70 70
	public void updateElement(UIElement element, Map parameters) {
71 71
		Object object = CorporaView.getFirstSelectedObject();
72
		//element.
73 72
		if(object != null && object instanceof TXMResult)	{
74 73
			element.setChecked(((TXMResult)object).isLocked());
75 74
		}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/adapters/DefaultAdapterFactory.java (revision 1470)
36 36
				@Override
37 37
				public String getLabel(Object result) {
38 38
					if (result instanceof TXMResult) {
39
						return ((TXMResult) result).getCurrentName() + " - " + result.getClass().getSimpleName();
39
						return ((TXMResult) result).getCurrentName() + " - " + result.getClass().getSimpleName(); //$NON-NLS-1$
40 40
					}
41 41
					else {
42 42
						return result.toString();
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorToolBar.java (revision 1470)
249 249

  
250 250
		// FIXME: SJ: new version to avoid to redefine the grid layout in each subclasses editors
251 251
		GridLayout layout = new GridLayout();
252
		layout.marginWidth = layout.marginBottom = layout.marginHeight = layout.marginTop = 0;
252
		layout.marginLeft = 5;
253
		layout.marginWidth = 0;
254
		layout.marginBottom = 0;
255
		layout.marginHeight = 0;
256
		layout.marginTop = 0;
253 257

  
254 258
		// FIXME: SJ: old version
255 259
//		RowLayout layout = new RowLayout();
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 1470)
169 169
	 */
170 170
	private GLComposite bottomSubWidgetsComposite;
171 171
	private GLComposite firstLineComposite;
172
	private boolean createPartControlDoneSucessfully = true; // FIXME: for now... muahahaha
172
	private boolean createPartControlDoneSucessfully = true; // FIXME: MD: for now... muahahaha
173 173

  
174 174
	/**
175 175
	 * installed extensions
......
365 365

  
366 366
			this.mainParametersComposite = new GLComposite(firstLineComposite, SWT.NONE, "Main parameters area"); //$NON-NLS-1$
367 367
			this.mainParametersComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
368
			this.mainParametersComposite.getLayout().marginLeft = 5;
368 369
			this.mainParametersComposite.getLayout().horizontalSpacing = 5;
369 370

  
370 371
			this.extendedParametersComposite = new GLComposite(parent, SWT.NONE, "Extended parameters area"); //$NON-NLS-1$
......
372 373

  
373 374
			this.topToolBar = new TXMEditorToolBar(this, this.firstLineComposite, this.extendedParametersComposite, SWT.FLAT | SWT.RIGHT, TOP_TOOLBAR_ID);
374 375

  
375
			// store the Compute button to access if later, especially from sublcasses
376
			// store the Compute button to access if later, especially from subclasses
376 377
			this.computeButton = this.topToolBar.getItemByContributionId(TOP_TOOLBAR_COMPUTE_BUTTON_ID);
377 378

  
378 379
			// computing parameters components
tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/GLComposite.java (revision 1470)
45 45

  
46 46
	public static GridLayout createDefaultLayout(int numColumns) {
47 47
		GridLayout gl = new GridLayout();
48
		gl.marginBottom = 0;gl.marginHeight = 0;gl.marginWidth = 0;gl.marginTop = 0;
48
		gl.marginBottom = 0;
49
		gl.marginHeight = 0;
50
		gl.marginWidth = 0;
51
		gl.marginTop = 0;
49 52
		gl.horizontalSpacing = 0;
50 53
		gl.verticalSpacing = 0;
51 54
		gl.numColumns = numColumns;

Also available in: Unified diff