Révision 262

tmp/org.txm.partition.rcp/OSGI-INF/l10n/bundle_fr.properties (revision 262)
1 1
Bundle-Name = Partition RCP
2
Bundle-Vendor = TXM
3 2
command.name = Dimensions
4 3
editor.name = Dimensions
5 4
page.name = Partition
tmp/org.txm.partition.rcp/OSGI-INF/l10n/bundle.properties (revision 262)
1 1
Bundle-Name = Partition RCP
2
Bundle-Vendor = TXM
3 2
command.name = Dimensions
4 3
editor.name = Dimensions
5 4
page.name = Partition
tmp/org.txm.partition.rcp/META-INF/MANIFEST.MF (revision 262)
13 13
 org.eclipse.core.expressions;bundle-version="3.4.600"
14 14
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
15 15
Bundle-ActivationPolicy: lazy
16
Bundle-Vendor: %Bundle-Vendor
16
Bundle-Vendor: Textometrie.org
17 17
Export-Package: org.txm.partition.rcp.adapters,
18 18
 org.txm.partition.rcp.handlers,
19 19
 org.txm.partition.rcp.messages,
tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/PartitionUIMessages.java (revision 262)
1 1
package org.txm.partition.rcp.messages;
2 2

  
3 3
import org.eclipse.osgi.util.NLS;
4
import org.txm.core.messages.TXMCoreMessages;
4
import org.txm.utils.messages.Utf8NLS;
5 5

  
6 6

  
7 7
/**
......
19 19

  
20 20
	static {
21 21
		// initialize resource bundle
22
		TXMCoreMessages.initializeMessages(BUNDLE_NAME, PartitionUIMessages.class);
22
		Utf8NLS.initializeMessages(BUNDLE_NAME, PartitionUIMessages.class);
23 23
	}
24 24

  
25 25
	private PartitionUIMessages() {
tmp/org.txm.progression.rcp/OSGI-INF/l10n/bundle.properties (revision 262)
1
Bundle-Name = Progression
1
Bundle-Name = Progression RCP
2 2
page.name = Progression
3 3
command.name = Progression
4 4
command.tooltip = Compute the progression chart of a query
tmp/org.txm.progression.rcp/OSGI-INF/l10n/bundle_ru.properties (revision 262)
1
Bundle-Name=Прогрессия
1
Bundle-Name=Прогрессия RCP
2 2
page.name=Прогрессия
3 3
command.name=Прогрессия
4 4
command.tooltip=Показывает график прогрессии ответов на запрос
tmp/org.txm.progression.rcp/OSGI-INF/l10n/bundle_fr.properties (revision 262)
1
Bundle-Name = Progression
1
Bundle-Name = Progression RCP
2 2
page.name = Progression
3 3
command.name = Progression
4 4
command.tooltip=Calculer le graphique de progression d'une ou plusieurs requêtes
tmp/org.txm.progression.rcp/plugin.xml (revision 262)
101 101
            name="Progression">
102 102
      </editor>
103 103
   </extension>
104
   <extension
105
         point="org.eclipse.core.expressions.definitions">
106
      <definition
107
            id="OneProgressionSelected">
108
         <with
109
               variable="selection">
110
            <iterate
111
                  ifEmpty="false"
112
                  operator="and">
113
               <instanceof
114
                     value="org.txm.progression.core.functions.Progression">
115
               </instanceof>
116
            </iterate>
117
         </with>
118
      </definition>
119
   </extension>
104 120

  
105 121
</plugin>
tmp/org.txm.progression.rcp/META-INF/MANIFEST.MF (revision 262)
4 4
Bundle-SymbolicName: org.txm.progression.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.lexicaltable.rcp;bundle-version="1.0.0",
7
Require-Bundle: org.txm.progression.core;bundle-version="1.0.0",
8
 org.txm.chartsengine.svgbatik.rcp;bundle-version="1.0.0",
9
 org.txm.lexicaltable.rcp;bundle-version="1.0.0",
8 10
 org.txm.chartsengine.r.core;bundle-version="1.0.0",
9
 org.txm.progression.core;bundle-version="1.0.0",
10 11
 org.txm.chartsengine.rcp;bundle-version="1.0.0",
11 12
 org.txm.chartsengine.core,
12 13
 org.eclipse.ui.workbench,
......
15 16
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
16 17
 org.txm.rcp,
17 18
 org.eclipse.core.runtime;bundle-version="3.10.0",
18
 org.txm.chartsengine.svgbatik.rcp;bundle-version="1.0.0",
19
 org.txm.synopticeditor.rcp
19
 org.txm.synopticeditor.rcp,
20
 org.eclipse.core.expressions;bundle-version="3.4.600"
20 21
Export-Package: org.txm.progression.rcp.adapters,
21
 org.txm.progression.rcp.dialogs
22
 org.txm.progression.rcp.chartsengine.events,
23
 org.txm.progression.rcp.dialogs,
24
 org.txm.progression.rcp.editors,
25
 org.txm.progression.rcp.forms,
26
 org.txm.progression.rcp.handlers,
27
 org.txm.progression.rcp.messages,
28
 org.txm.progression.rcp.preferences
29
Bundle-Vendor: Textometrie.org
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java (revision 262)
61 61
	
62 62
	
63 63

  
64
//FIXME: version with TXMBroser old system edition
64
//FIXME: version with TXMBrowser old system edition
65 65
//	@Override
66 66
//	public void processEvent(final AWTEvent event, final int eventArea, final Object o) {
67 67
//		
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java (revision 262)
32 32
import org.eclipse.core.runtime.IProgressMonitor;
33 33
import org.eclipse.core.runtime.IStatus;
34 34
import org.eclipse.core.runtime.Status;
35
import org.eclipse.jface.viewers.IStructuredSelection;
36 35
import org.eclipse.jface.window.Window;
37 36
import org.eclipse.osgi.util.NLS;
38 37
import org.eclipse.swt.SWT;
......
72 71
	// FIXME: should be put in an Activator? or better in an extension point loaded by the corpora view? or in a method called here as initTreeDoubleClickListener(Class resultDataType, String commandId)?
73 72
	// adds a double click listener to the Corpus View
74 73
	static	{
75
		CorporaView.addDoubleClickListener(Progression.class, ComputeProgression.class); //$NON-NLS-1$
74
		CorporaView.addDoubleClickListener(Progression.class, ComputeProgression.class);
76 75
	}
77 76
	
78 77
	
......
82 81
	 */
83 82
	@Override
84 83
	public Object execute(ExecutionEvent event) throws ExecutionException {
85
		if (!Toolbox.isSearchEngineInitialized()) return false;
86
		
87
		if(!this.checkStatsEngine()) {
88
			return null;
84

  
85
		if(!this.checkStatsEngine() || !this.checkCorpusEngine()) {
86
			return false;
89 87
		}
90 88

  
91
		
92
		IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
89
		Object selection = this.getSelection();
93 90

  
94
		
95
		 
96
		// Computes a new progression
97
		if(selection.getFirstElement() instanceof Corpus)	{
98
			Corpus corpus = (Corpus) selection.getFirstElement();
91
		// Compute a new progression
92
		if(selection instanceof Corpus)	{
93
			Corpus corpus = (Corpus) selection;
99 94

  
100 95
			if (!Progression.canRunProgression(corpus)) {
101 96
				Log.severe(ProgressionCoreMessages.ComputeProgression_0);
......
114 109

  
115 110
		}
116 111
		// Reopens a progression result with default preferences
117
		else if(selection.getFirstElement() instanceof Progression)	{
118
			openEditor((Progression) selection.getFirstElement());
112
		else if(selection instanceof Progression)	{
113
			openEditor((Progression) selection);
119 114
		}
120 115
		
121 116
		return null;
......
277 272
					}
278 273
					monitor.worked(45);
279 274

  
280
					monitor.subTask(Messages.CreatePartition_9);
275
					monitor.subTask(Messages.RefreshingCorporaView);
281 276
					CorporaView.storeResult(corpus, progression);
282 277
					
283 278
					monitor.worked(5);
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/preferences/ProgressionPreferencePage.java (revision 262)
39 39
import org.txm.rcp.preferences.TXMPreferenceStore;
40 40
import org.txm.rcpapplication.TxmPreferences;
41 41
import org.txm.rcpapplication.jface.DoubleFieldEditor;
42
// TODO: Auto-generated Javadoc
42

  
43 43
/**
44
 * This class represents a preference page that is contributed to the
45
 * Preferences dialog. By subclassing <samp>FieldEditorPreferencePage</samp>, we
46
 * can use the field support built into JFace that allows us to create a page
47
 * that is small and knows how to save, restore and apply itself.
48
 * <p>
49
 * This page is used to modif y preferences only. They are stored in the
50
 * preference store that belongs to the main plug-in class. That way,
51
 * preferences can be accessed directly via the preference store.
44
 * Progression preference page.
45
 * @author sjacquot
46
 *
52 47
 */
53

  
54 48
public class ProgressionPreferencePage extends TXMPreferencePage {
55 49

  
56 50

  
......
91 85
	@Override
92 86
	public void init(IWorkbench workbench) {
93 87
		this.setPreferenceStore(new TXMPreferenceStore(ProgressionPreferences.PREFERENCES_NODE));
88
		//FIXME: description
94 89
		//setDescription("Progression");
95 90
		this.setTitle(ProgressionCoreMessages.RESULT_TYPE);
96 91
		this.setImageDescriptor(ProgressionAdapterFactory.ICON);
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/dialogs/ProgressionDialog.java (revision 262)
58 58
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
59 59
import org.txm.core.messages.TXMCoreMessages;
60 60
import org.txm.core.preferences.TXMPreferences;
61
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
62 61
import org.txm.progression.core.preferences.ProgressionPreferences;
63 62
import org.txm.rcp.preferences.TXMPreferenceStore;
64 63
import org.txm.rcpapplication.Messages;
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/forms/___ProgressionForm.java (revision 262)
1
package org.txm.progression.rcp.forms;
2
import org.eclipse.swt.SWT;
3
import org.eclipse.swt.custom.SashForm;
4
import org.eclipse.swt.custom.ScrolledComposite;
5
import org.eclipse.swt.layout.FillLayout;
6
import org.eclipse.swt.layout.GridData;
7
import org.eclipse.swt.layout.GridLayout;
8
import org.eclipse.swt.widgets.Button;
9
import org.eclipse.swt.widgets.Combo;
10
import org.eclipse.swt.widgets.Composite;
11
import org.eclipse.swt.widgets.Label;
12
import org.eclipse.swt.widgets.Table;
13
import org.eclipse.swt.widgets.Text;
14
import org.txm.rcpapplication.Messages;
15

  
16

  
17
public class ___ProgressionForm extends Composite {
18
	SashForm sashForm;
19
	
20
	private Table table;
21
	private Text scaleTextEdit;
22
	private Text regTextEdit;
23
	
24
	Button btnSupprimer;
25
	Button cumulBtn;
26
	Button densiBtn;
27
	
28
	Combo structCombo;
29
	Combo propCombo;
30
	private Button styleRadio;
31
	private Button repeatRadio;
32
	private Button NBRadio;
33
	private Button btnNewButton;
34

  
35
	/**
36
	 * Create the composite.
37
	 * @param parent
38
	 * @param style
39
	 */
40
	public ___ProgressionForm(Composite parent, int style) {
41
		super(parent, style);
42
		setLayout(new GridLayout(1, true));
43
		
44
		sashForm = new SashForm(this, SWT.VERTICAL);
45
		sashForm.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
46
		
47
		ScrolledComposite scrolledComposite_1 = new ScrolledComposite(sashForm, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
48
		scrolledComposite_1.setExpandHorizontal(true);
49
		scrolledComposite_1.setExpandVertical(true);
50
		
51
		Composite composite_1 = new Composite(scrolledComposite_1, SWT.NONE);
52
		composite_1.setLayout(new FillLayout(SWT.VERTICAL));
53
		
54
		Composite composite = new Composite(composite_1, SWT.NONE);
55
		composite.setLayout(new GridLayout(5, false));
56
		
57
		Label label = new Label(composite, SWT.NONE);
58
		GridData gd_label = new GridData(SWT.LEFT, SWT.CENTER, false, false, 1, 1);
59
		gd_label.widthHint = 29;
60
		label.setLayoutData(gd_label);
61
		label.setText(Messages.ProgressionForm_0);
62
		
63
		cumulBtn = new Button(composite, SWT.RADIO);
64
		cumulBtn.setText(Messages.ProgressionForm_1);
65
		cumulBtn.setSelection(true);
66
		
67
		densiBtn = new Button(composite, SWT.RADIO);
68
		densiBtn.setText(Messages.ProgressionForm_2);
69
		
70
		Label lblEchelle = new Label(composite, SWT.NONE);
71
		lblEchelle.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
72
		lblEchelle.setText(Messages.ProgressionForm_3);
73
		
74
		scaleTextEdit = new Text(composite, SWT.BORDER);
75
		scaleTextEdit.setText("1.0"); //$NON-NLS-1$
76
		
77
		Label lblOptionsDaffichage = new Label(composite, SWT.NONE);
78
		lblOptionsDaffichage.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 4, 1));
79
		lblOptionsDaffichage.setText(Messages.ProgressionForm_5);
80
		new Label(composite, SWT.NONE);
81
		
82
		Label label_6 = new Label(composite, SWT.NONE);
83
		label_6.setText(Messages.ProgressionForm_6);
84
		
85
		structCombo = new Combo(composite, SWT.NONE);
86
		
87
		Label label_5 = new Label(composite, SWT.NONE);
88
		label_5.setText(Messages.ProgressionForm_7);
89
		
90
		propCombo = new Combo(composite, SWT.NONE);
91
		propCombo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
92
		new Label(composite, SWT.NONE);
93
		new Label(composite, SWT.NONE);
94
		
95
		Label label_7 = new Label(composite, SWT.NONE);
96
		label_7.setText(Messages.ProgressionForm_8);
97
		
98
		regTextEdit = new Text(composite, SWT.BORDER);
99
		regTextEdit.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
100
		new Label(composite, SWT.NONE);
101
		
102
		styleRadio = new Button(composite, SWT.CHECK);
103
		styleRadio.setText(Messages.ProgressionForm_9);
104
		styleRadio.setSelection(true);
105
		
106
		repeatRadio = new Button(composite, SWT.CHECK);
107
		repeatRadio.setText(Messages.ProgressionForm_10);
108
		
109
		NBRadio = new Button(composite, SWT.CHECK);
110
		NBRadio.setText(Messages.ProgressionForm_11);
111
		new Label(composite, SWT.NONE);
112
	
113
		Composite composite_2 = new Composite(composite_1, SWT.NONE);
114
		composite_2.setLayout(new GridLayout(1, false));
115
		
116
		Composite composite_3 = new Composite(composite_2, SWT.NONE);
117
		composite_3.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
118
		composite_3.setLayout(new FillLayout(SWT.HORIZONTAL));
119
		
120
		Label lblRequetes = new Label(composite_3, SWT.NONE);
121
		lblRequetes.setText(Messages.ProgressionForm_12);
122
		
123
		btnNewButton = new Button(composite_3, SWT.NONE);
124
		btnNewButton.setText(Messages.ProgressionForm_13);
125
		
126
		btnSupprimer = new Button(composite_3, SWT.NONE);
127
		btnSupprimer.setText(Messages.ProgressionForm_14);
128
		scrolledComposite_1.setContent(composite_1);
129
		scrolledComposite_1.setMinSize(composite_1.computeSize(SWT.DEFAULT, SWT.DEFAULT));
130
		
131
//		table = new Table(sashForm, SWT.BORDER | SWT.FULL_SELECTION);
132
//		table.setHeaderVisible(true);
133
//		table.setLinesVisible(true);
134
//		sashForm.setWeights(new int[] {215, 334});
135
	}
136
	
137
	public void setTable(Table table) {
138
		this.table = table;
139
		//table = new Table(sashForm, SWT.BORDER | SWT.FULL_SELECTION);
140
		table.setHeaderVisible(true);
141
		table.setLinesVisible(true);
142
		sashForm.setWeights(new int[] {215, 334});
143
	}
144
	
145
	@Override
146
	protected void checkSubclass() {
147
		// Disable the check that prevents subclassing of SWT components
148
	}
149

  
150
	public SashForm getSash() {
151
		return sashForm;
152
	}
153
	
154
	/**
155
	 * @return the table
156
	 */
157
	public Table getTable() {
158
		return table;
159
	}
160

  
161
	/**
162
	 * @return the scaleTextEdit
163
	 */
164
	public Text getScaleTextEdit() {
165
		return scaleTextEdit;
166
	}
167

  
168
	/**
169
	 * @return the regTextEdit
170
	 */
171
	public Text getRegTextEdit() {
172
		return regTextEdit;
173
	}
174

  
175
	/**
176
	 * @return the btnSupprimer
177
	 */
178
	public Button getBtnSupprimer() {
179
		return btnSupprimer;
180
	}
181

  
182
	/**
183
	 * @return the cumulBtn
184
	 */
185
	public Button getCumulBtn() {
186
		return cumulBtn;
187
	}
188

  
189
	/**
190
	 * @return the densiBtn
191
	 */
192
	public Button getDensiBtn() {
193
		return densiBtn;
194
	}
195

  
196
	/**
197
	 * @return the structCombo
198
	 */
199
	public Combo getStructCombo() {
200
		return structCombo;
201
	}
202

  
203
	/**
204
	 * @return the propCombo
205
	 */
206
	public Combo getPropCombo() {
207
		return propCombo;
208
	}
209

  
210
	/**
211
	 * @return the styleRadio
212
	 */
213
	public Button getStyleRadio() {
214
		return styleRadio;
215
	}
216

  
217
	/**
218
	 * @return the repeatRadio
219
	 */
220
	public Button getRepeatRadio() {
221
		return repeatRadio;
222
	}
223

  
224
	/**
225
	 * @return the nBRadio
226
	 */
227
	public Button getNBRadio() {
228
		return NBRadio;
229
	}
230

  
231
	/**
232
	 * @return the btnNewButton
233
	 */
234
	public Button getBtnNewButton() {
235
		return btnNewButton;
236
	}
237
}
0 238

  
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java (revision 262)
1 1
package org.txm.progression.rcp.messages;
2 2

  
3 3
import org.eclipse.osgi.util.NLS;
4
import org.txm.core.messages.TXMCoreMessages;
4
import org.txm.utils.messages.Utf8NLS;
5 5

  
6 6
public class ProgressionUIMessages extends NLS {
7 7

  
......
14 14

  
15 15
	static {
16 16
		// initializes resource bundle
17
		TXMCoreMessages.initializeMessages(BUNDLE_NAME, ProgressionUIMessages.class);
17
		Utf8NLS.initializeMessages(BUNDLE_NAME, ProgressionUIMessages.class);
18 18
	}
19 19
	
20 20
	private ProgressionUIMessages() {
tmp/org.txm.partition.core/META-INF/MANIFEST.MF (revision 262)
1 1
Manifest-Version: 1.0
2 2
Bundle-ManifestVersion: 2
3
Bundle-Name: Partition TBX
3
Bundle-Name: Partition Core
4 4
Bundle-SymbolicName: org.txm.partition.core;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Require-Bundle: org.txm.core;bundle-version="0.7.0",
......
16 16
 org.txm.partition.core.functions,
17 17
 org.txm.partition.core.messages,
18 18
 org.txm.partition.core.preferences
19
Bundle-Vendor: TXM
19
Bundle-Vendor: Textometrie.org
tmp/org.txm.partition.core/src/org/txm/partition/core/messages/PartitionCoreMessages.java (revision 262)
1 1
package org.txm.partition.core.messages;
2 2

  
3 3
import org.eclipse.osgi.util.NLS;
4
import org.txm.core.messages.TXMCoreMessages;
4
import org.txm.utils.messages.Utf8NLS;
5 5

  
6 6

  
7

  
7
/**
8
 * Partition core messages.
9
 * 
10
 * @author mdecorde
11
 * @author sjacquot
12
 *
13
 */
8 14
public class PartitionCoreMessages extends NLS {
9 15

  
10 16
	private static final String BUNDLE_NAME = "org.txm.partition.core.messages.messages"; //$NON-NLS-1$
......
20 26
	
21 27
	static {
22 28
		// initialize resource bundle
23
		TXMCoreMessages.initializeMessages(BUNDLE_NAME, PartitionCoreMessages.class);
29
		Utf8NLS.initializeMessages(BUNDLE_NAME, PartitionCoreMessages.class);
24 30
	}
25 31

  
26 32
	private PartitionCoreMessages() {
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsBarChartCreator.java (revision 262)
11 11
import org.jfree.data.xy.XYSeries;
12 12
import org.jfree.data.xy.XYSeriesCollection;
13 13
import org.txm.chartsengine.core.ChartsEngine;
14
import org.txm.core.preferences.TXMPreferences;
14 15
import org.txm.core.results.ITXMResult;
15 16
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
16 17
import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
17 18
import org.txm.chartsengine.jfreechart.core.themes.base.ExtendedNumberAxis;
18 19
import org.txm.chartsengine.jfreechart.core.themes.base.SymbolAxisBetweenTicks;
19
import org.txm.core.preferences.TXMPreferences;
20 20
import org.txm.partition.core.chartsengine.base.Utils;
21 21
import org.txm.partition.core.functions.PartitionDimensions;
22 22
import org.txm.partition.core.messages.PartitionCoreMessages;
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsPieChartCreator.java (revision 262)
3 3

  
4 4
import org.jfree.chart.JFreeChart;
5 5
import org.jfree.data.general.DefaultPieDataset;
6
import org.txm.core.preferences.TXMPreferences;
6 7
import org.txm.core.results.ITXMResult;
7 8
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
8
import org.txm.core.preferences.TXMPreferences;
9 9
import org.txm.partition.core.chartsengine.base.Utils;
10 10
import org.txm.partition.core.functions.PartitionDimensions;
11 11
import org.txm.partition.core.preferences.PartitionDimensionsPreferences;
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsBarChartCreator.java (revision 262)
4 4
import java.util.List;
5 5

  
6 6
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
7
import org.txm.core.preferences.TXMPreferences;
7 8
import org.txm.core.results.ITXMResult;
8 9
import org.txm.chartsengine.r.core.RChartCreator;
9 10
import org.txm.chartsengine.r.core.RChartsEngine;
10
import org.txm.core.preferences.TXMPreferences;
11 11
import org.txm.partition.core.chartsengine.base.Utils;
12 12
import org.txm.partition.core.functions.PartitionDimensions;
13 13
import org.txm.partition.core.messages.PartitionCoreMessages;
tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsPieChartCreator.java (revision 262)
4 4
import java.util.List;
5 5

  
6 6
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
7
import org.txm.core.preferences.TXMPreferences;
7 8
import org.txm.core.results.ITXMResult;
8 9
import org.txm.chartsengine.r.core.RChartCreator;
9 10
import org.txm.chartsengine.r.core.RChartsEngine;
10
import org.txm.core.preferences.TXMPreferences;
11 11
import org.txm.partition.core.chartsengine.base.Utils;
12 12
import org.txm.partition.core.functions.PartitionDimensions;
13 13
import org.txm.partition.core.messages.PartitionCoreMessages;
tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 262)
581 581

  
582 582
	@Override
583 583
	public String getName() {
584
		return this.parent.getSimpleName() + ": " + this.getSimpleName();
584
		try {
585
			return this.parent.getSimpleName() + ": " + this.getSimpleName();			
586
		}
587
		catch(Exception e) {
588
			return super.toString();
589
		}
590

  
585 591
	}
586 592

  
587 593
	@Override
tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionChartCreator.java (revision 262)
15 15
import org.jfree.ui.RectangleAnchor;
16 16
import org.jfree.ui.TextAnchor;
17 17
import org.txm.chartsengine.core.ChartsEngine;
18
import org.txm.core.preferences.TXMPreferences;
18 19
import org.txm.core.results.ITXMResult;
19 20
import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
20 21
import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
21 22
import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
22 23
import org.txm.chartsengine.jfreechart.core.themes.base.ExtendedNumberAxis;
23
import org.txm.core.preferences.TXMPreferences;
24 24
import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
25 25
import org.txm.progression.core.chartsengine.base.Utils;
26 26
import org.txm.progression.core.chartsengine.jfreechart.themes.highcharts.renderers.ProgressionItemSelectionRenderer;
tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/r/RProgressionChartCreator.java (revision 262)
5 5

  
6 6
import org.apache.commons.lang.StringEscapeUtils;
7 7
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
8
import org.txm.core.results.ITXMResult;
9 8
import org.txm.chartsengine.r.core.RChartCreator;
10 9
import org.txm.chartsengine.r.core.themes.DefaultTheme;
11 10
import org.txm.core.preferences.TXMPreferences;
11
import org.txm.core.results.ITXMResult;
12 12
import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
13 13
import org.txm.progression.core.chartsengine.base.Utils;
14 14
import org.txm.progression.core.functions.Progression;
15 15
import org.txm.progression.core.preferences.ProgressionPreferences;
16 16
import org.txm.statsengine.core.StatException;
17 17
import org.txm.statsengine.r.core.RWorkspace;
18
import org.txm.statsengine.r.core.RWorkspaceException;
18
import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
19 19
import org.txm.utils.logger.Log;
20 20

  
21 21
/**
......
155 155
			// TODO Auto-generated catch block
156 156
			org.txm.utils.logger.Log.printStackTrace(e);
157 157
		}
158
		catch(StatException e) {
159
			// TODO Auto-generated catch block
160
			org.txm.utils.logger.Log.printStackTrace(e);
161
		}
162 158

  
163 159
		return file;
164 160
	}
tmp/org.txm.progression.core/META-INF/MANIFEST.MF (revision 262)
1 1
Manifest-Version: 1.0
2 2
Bundle-ManifestVersion: 2
3
Bundle-Name: Progression TBX
3
Bundle-Name: Progression Core
4 4
Bundle-SymbolicName: org.txm.progression.core;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
7
Require-Bundle: org.txm.chartsengine.core,
7
Require-Bundle: org.txm.statsengine.r.core;bundle-version="1.0.0",
8
 org.txm.chartsengine.core,
8 9
 org.eclipse.core.runtime,
9 10
 org.txm.core;bundle-version="0.7.0",
10 11
 org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
......
16 17
 org.txm.progression.core.functions,
17 18
 org.txm.progression.core.messages,
18 19
 org.txm.progression.core.preferences
19
Bundle-Vendor: TXM
20
Bundle-Vendor: Textometrie.org

Formats disponibles : Unified diff