Révision 242

tmp/org.txm.libs.groovy-all/META-INF/MANIFEST.MF (revision 242)
2 2
Bundle-ManifestVersion: 2
3 3
Bundle-Name: Groovy-all
4 4
Bundle-SymbolicName: groovy-all
5
Bundle-Version: 1.0.0.qualifier
5
Bundle-Version: 2.3.3
6 6
Bundle-ClassPath: groovy-all-2.3.3.jar
7 7
Export-Package: groovy.beans,
8 8
 groovy.grape,
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/preferences/ProgressionPreferencePage.java (revision 242)
31 31
import org.eclipse.swt.widgets.Composite;
32 32
import org.eclipse.ui.IWorkbench;
33 33
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
34
import org.txm.progression.core.messages.ProgressionCoreMessages;
34 35
import org.txm.progression.core.preferences.ProgressionPreferences;
35 36
import org.txm.progression.rcp.adapters.ProgressionAdapterFactory;
36 37
import org.txm.progression.rcp.messages.ProgressionUIMessages;
......
91 92
	public void init(IWorkbench workbench) {
92 93
		this.setPreferenceStore(new TXMPreferenceStore(ProgressionPreferences.PREFERENCES_NODE));
93 94
		//setDescription("Progression");
94
		this.setTitle(ProgressionUIMessages.ProgressionPreferencePage_2);
95
		this.setTitle(ProgressionCoreMessages.RESULT_TYPE);
95 96
		this.setImageDescriptor(ProgressionAdapterFactory.ICON);
96 97
	}
97 98

  
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/dialogs/ProgressionDialog.java (revision 242)
56 56
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
57 57
import org.txm.chartsengine.r.core.themes.DefaultTheme;
58 58
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
59
import org.txm.core.messages.TXMCoreMessages;
59 60
import org.txm.core.preferences.TXMPreferences;
61
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
60 62
import org.txm.progression.core.preferences.ProgressionPreferences;
61 63
import org.txm.rcp.preferences.TXMPreferenceStore;
62 64
import org.txm.rcpapplication.Messages;
......
324 326

  
325 327
			// properties combo
326 328
			Label propLabel = new Label(displayParam, SWT.NONE);
327
			propLabel.setText(Messages.LexicalTable_1);
329
			propLabel.setText(TXMCoreMessages.PROPERTY_1);
328 330
			propLabel.setAlignment(SWT.CENTER);
329 331

  
330 332
			propertyCombo = new Combo(displayParam, SWT.READ_ONLY);
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages.properties (revision 242)
1

  
2
ProgressionPreferencePage_3 = Default graph type is cumulative
3
ProgressionPreferencePage_5 = Single line style
4
ProgressionPreferencePage_6 = Repeat the values of the structure properties
5
ProgressionPreferencePage_7 = Bande size multiplier
0 6

  
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_ru.properties (revision 242)
1

  
2
ProgressionPreferencePage_3 = Кумулятивный граф прогрессии
3
ProgressionPreferencePage_5 = Линии в одном стиле
4
ProgressionPreferencePage_6 = Повторять значения с свойств структур
5
ProgressionPreferencePage_7 = Масштаб границ структур
0 6

  
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_fr.properties (revision 242)
1

  
2
ProgressionPreferencePage_3 = Graphe de progression cumulatif
3
ProgressionPreferencePage_5 = Style de ligne unique
4
ProgressionPreferencePage_6 = Répéter les valeurs de propriétés de structures
5
ProgressionPreferencePage_7 = Échelle des limites de structures
0 6

  
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java (revision 242)
5 5

  
6 6
public class ProgressionUIMessages extends NLS {
7 7

  
8
	// FIXME: use the same properties file than the bundle
9
	private static final String BUNDLE_NAME = "l10n.bundle"; //$NON-NLS-1$
8
	private static final String BUNDLE_NAME = "org.txm.progression.rcp.messages.messages"; //$NON-NLS-1$
10 9

  
11
	public static String ProgressionPreferencePage_2;
12 10
	public static String ProgressionPreferencePage_3;
13
	public static String ProgressionPreferencePage_4;
14 11
	public static String ProgressionPreferencePage_5;
15 12
	public static String ProgressionPreferencePage_6;
16 13
	public static String ProgressionPreferencePage_7;
......
18 15
	static {
19 16
		// initializes resource bundle
20 17
		TXMCoreMessages.initializeMessages(BUNDLE_NAME, ProgressionUIMessages.class);
21
		//NLS.initializeMessages(BUNDLE_NAME, RCPProgressionMessages.class);
22 18
	}
23 19
	
24 20
	private ProgressionUIMessages() {
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java (revision 242)
27 27
//
28 28
package org.txm.progression.rcp.handlers;
29 29

  
30
import org.eclipse.core.commands.AbstractHandler;
31 30
import org.eclipse.core.commands.ExecutionEvent;
32 31
import org.eclipse.core.commands.ExecutionException;
33 32
import org.eclipse.core.runtime.IProgressMonitor;
......
52 51
import org.txm.progression.core.preferences.ProgressionPreferences;
53 52
import org.txm.progression.rcp.dialogs.ProgressionDialog;
54 53
import org.txm.progression.rcp.forms.ProgressionParametersComposite;
54
import org.txm.rcp.handlers.BaseAbstractHandler;
55 55
import org.txm.rcpapplication.JobsTimer;
56 56
import org.txm.rcpapplication.Messages;
57 57
import org.txm.rcpapplication.StatusLine;
......
66 66
 * @author mdecorde
67 67
 * @author sjacquot
68 68
 */
69
public class ComputeProgression extends AbstractHandler {
69
public class ComputeProgression extends BaseAbstractHandler {
70 70
	
71 71
	
72 72
	// 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)?
......
84 84
	public Object execute(ExecutionEvent event) throws ExecutionException {
85 85
		if (!Toolbox.isSearchEngineInitialized()) return false;
86 86
		
87
		if (!Toolbox.isStatEngineInitialized()) {
88
			Log.severe(ProgressionCoreMessages.ComputeProgression_5);
87
		if(!this.checkStatsEngine()) {
89 88
			return null;
90 89
		}
90

  
91 91
		
92 92
		IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
93 93

  
tmp/org.txm.progression.rcp/OSGI-INF/l10n/___bundle_ru.properties (revision 242)
1 1
Bundle-Name=\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441\u0438\u044F
2 2
page.name=\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441\u0438\u044F
3 3
command.name=\u041f\u0440\u043e\u0433\u0440\u0435\u0441\u0441\u0438\u044f
4
command.tooltip=\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442 \u0433\u0440\u0430\u0444\u0438\u043a \u043f\u0440\u043e\u0433\u0440\u0435\u0441\u0441\u0438\u0438 \u043e\u0442\u0432\u0435\u0442\u043e\u0432 \u043d\u0430 \u0437\u0430\u043f\u0440\u043e\u0441
5
ProgressionPreferencePage_2=\u041f\u0440\u043e\u0433\u0440\u0435\u0441\u0441\u0438\u044f
6
ProgressionPreferencePage_3=\u041a\u0443\u043c\u0443\u043b\u044f\u0442\u0438\u0432\u043d\u044b\u0439 \u0433\u0440\u0430\u0444 \u043f\u0440\u043e\u0433\u0440\u0435\u0441\u0441\u0438\u0438
7
ProgressionPreferencePage_4=\u0427/\u0411 \u043b\u0438\u043d\u0438\u0438
8
ProgressionPreferencePage_5=\u041b\u0438\u043d\u0438\u0438 \u0432 \u043e\u0434\u043d\u043e\u043c \u0441\u0442\u0438\u043b\u0435
9
ProgressionPreferencePage_6=\u041f\u043e\u0432\u0442\u043e\u0440\u044f\u0442\u044c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u0441 \u0441\u0432\u043e\u0439\u0441\u0442\u0432 \u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440
10
ProgressionPreferencePage_7=\u041c\u0430\u0441\u0448\u0442\u0430\u0431 \u0433\u0440\u0430\u043d\u0438\u0446 \u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440
4
command.tooltip=\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442 \u0433\u0440\u0430\u0444\u0438\u043a \u043f\u0440\u043e\u0433\u0440\u0435\u0441\u0441\u0438\u0438 \u043e\u0442\u0432\u0435\u0442\u043e\u0432 \u043d\u0430 \u0437\u0430\u043f\u0440\u043e\u0441
tmp/org.txm.progression.rcp/OSGI-INF/l10n/bundle_ru.properties (revision 242)
1 1
Bundle-Name=Прогрессия
2 2
page.name=Прогрессия
3 3
command.name=Прогрессия
4
command.tooltip=Показывает график прогрессии ответов на запрос
5
ProgressionPreferencePage_2=Прогрессия
6
ProgressionPreferencePage_3=Кумулятивный граф прогрессии
7
ProgressionPreferencePage_4=Ч/Б линии
8
ProgressionPreferencePage_5=Линии в одном стиле
9
ProgressionPreferencePage_6=Повторять значения с свойств структур
10
ProgressionPreferencePage_7=Масштаб границ структур
4
command.tooltip=Показывает график прогрессии ответов на запрос
tmp/org.txm.progression.rcp/OSGI-INF/l10n/bundle_fr.properties (revision 242)
1 1
Bundle-Name = Progression
2 2
page.name = Progression
3 3
command.name = Progression
4
command.label = Progression
5
command.tooltip=Calculer la progression d'une ou plusieurs requêtes
6
ProgressionPreferencePage_2=Progression
7
ProgressionPreferencePage_3=Graphe de progression cumulatif
8
ProgressionPreferencePage_4=Niveaux de gris
9
ProgressionPreferencePage_5=Style de ligne unique
10
ProgressionPreferencePage_6=Répéter les valeurs de propriétés de structures
11
ProgressionPreferencePage_7=Échelle des limites de structures
4
command.tooltip=Calculer le graphique de progression d'une ou plusieurs requêtes
tmp/org.txm.progression.rcp/OSGI-INF/l10n/bundle.properties (revision 242)
1 1
Bundle-Name = Progression
2 2
page.name = Progression
3 3
command.name = Progression
4
command.tooltip = Process the progression graphic of a query
5
ProgressionPreferencePage_2=Progression
6
ProgressionPreferencePage_3=Default graph type is cumulative
7
ProgressionPreferencePage_4=Grayscale
8
ProgressionPreferencePage_5=Single line style
9
ProgressionPreferencePage_6=Repeat the values of the structure properties
10
ProgressionPreferencePage_7=Bande size multiplier
4
command.tooltip = Compute the progression chart of a query
tmp/org.txm.progression.rcp/.classpath (revision 242)
3 3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry kind="src" path="src"/>
6
	<classpathentry kind="src" path="OSGI-INF"/>
7 6
	<classpathentry kind="output" path="bin"/>
8 7
</classpath>
tmp/org.txm.progression.rcp/META-INF/MANIFEST.MF (revision 242)
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.chartsengine.r.core;bundle-version="1.0.0",
7
Require-Bundle: org.txm.lexicaltable.rcp;bundle-version="1.0.0",
8
 org.txm.chartsengine.r.core;bundle-version="1.0.0",
8 9
 org.txm.progression.core;bundle-version="1.0.0",
9 10
 org.txm.chartsengine.rcp;bundle-version="1.0.0",
10 11
 org.txm.chartsengine.core,
tmp/org.txm.lexicaltable.rcp/META-INF/MANIFEST.MF (revision 242)
4 4
Bundle-SymbolicName: org.txm.lexicaltable.rcp;singleton:=true
5 5
Bundle-Version: 1.0.0.qualifier
6 6
Require-Bundle: org.txm.index.core;bundle-version="1.0.0",
7
 org.txm.ca.core;bundle-version="1.0.0",
7 8
 org.txm.core,
8 9
 org.txm.lexicaltable.core;bundle-version="1.0.0",
9 10
 org.eclipse.core.runtime,
10 11
 org.txm.rcp,
11
 org.eclipse.ui;bundle-version="3.106.1"
12
 org.eclipse.ui;bundle-version="3.106.1",
13
 org.txm.statsengine.r.rcp
12 14
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 15
Bundle-ActivationPolicy: lazy
14 16
Export-Package: org.txm.lexicaltable.rcp.adapters,
15 17
 org.txm.lexicaltable.rcp.editors,
16 18
 org.txm.lexicaltable.rcp.handlers,
19
 org.txm.lexicaltable.rcp.messages,
17 20
 org.txm.lexicaltable.rcp.preferences
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableDialog.java (revision 242)
1
// Copyright © 2010-2013 ENS de Lyon.
2
// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
3
// Lyon 2, University of Franche-Comté, University of Nice
4
// Sophia Antipolis, University of Paris 3.
5
// 
6
// The TXM platform is free software: you can redistribute it
7
// and/or modify it under the terms of the GNU General Public
8
// License as published by the Free Software Foundation,
9
// either version 2 of the License, or (at your option) any
10
// later version.
11
// 
12
// The TXM platform is distributed in the hope that it will be
13
// useful, but WITHOUT ANY WARRANTY; without even the implied
14
// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
15
// PURPOSE. See the GNU General Public License for more
16
// details.
17
// 
18
// You should have received a copy of the GNU General
19
// Public License along with the TXM platform. If not, see
20
// http://www.gnu.org/licenses.
21
// 
22
// 
23
// 
24
// $LastChangedDate:$
25
// $LastChangedRevision:$
26
// $LastChangedBy:$ 
27
//
28
package org.txm.lexicaltable.rcp.editors;
29

  
30
import java.util.ArrayList;
31
import java.util.List;
32

  
33
import org.eclipse.jface.dialogs.Dialog;
34
import org.eclipse.jface.dialogs.MessageDialog;
35
import org.eclipse.swt.SWT;
36
import org.eclipse.swt.layout.GridData;
37
import org.eclipse.swt.layout.GridLayout;
38
import org.eclipse.swt.widgets.Combo;
39
import org.eclipse.swt.widgets.Composite;
40
import org.eclipse.swt.widgets.Control;
41
import org.eclipse.swt.widgets.Label;
42
import org.eclipse.swt.widgets.Shell;
43
import org.eclipse.swt.widgets.Spinner;
44
import org.txm.ca.core.preferences.CAPreferences;
45
import org.txm.core.messages.TXMCoreMessages;
46
import org.txm.core.preferences.TXMPreferences;
47
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
48
import org.txm.rcpapplication.Messages;
49
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
50
import org.txm.searchengine.cqp.corpus.Corpus;
51
import org.txm.searchengine.cqp.corpus.Property;
52
/**
53
 * Retrieve the property analysis to be used for computing correspondence
54
 * analysis. and also the max number of entries and their minimal frequency
55
 * 
56
 * @author sjacquot
57
 * @author sloiseau
58
 * 
59
 */
60
public class LexicalTableDialog extends Dialog {
61

  
62
	/** The property. */
63
	private Property property;
64
	
65
	/** The properties. */
66
	private List<Property> properties;
67
	
68
	/** The ana prop combo. */
69
	private Combo anaPropCombo;
70
	
71
	/** The fmin label. */
72
	Label fminLabel;
73
	
74
	/** The maxlines label. */
75
	Label maxlinesLabel;
76
	
77
	/** The maxlines spinner. */
78
	Spinner maxlinesSpinner;
79
	
80
	/** The fmin spinner. */
81
	Spinner fminSpinner;
82
	
83
	/** The corpus. */
84
	Corpus corpus;
85

  
86
	/** The title. */
87
	String title;
88
	
89
	/** The mess. */
90
	String mess;
91
	
92
	/** The max, default value read from CA preferences. */
93
	private int vmax = TXMPreferences.getInt(CAPreferences.PREFERENCES_NODE, CAPreferences.V_MAX);
94
	
95
	/** The fmin, default value read from CA preferences. */
96
	private int fmin = TXMPreferences.getInt(CAPreferences.PREFERENCES_NODE, CAPreferences.F_MIN);
97

  
98
	/**
99
	 * Instantiates a new compute correspondence analysis dialog.
100
	 *
101
	 * @param parentShell the parent shell
102
	 * @param corpus the corpus
103
	 */
104
	public LexicalTableDialog(Shell parentShell, Corpus corpus, String title) {
105
		super(parentShell);
106
		try {
107
			this.corpus = corpus;
108
			this.title = title;
109
			this.properties = new ArrayList<Property>(corpus.getOrderedProperties());
110
		} catch (CqiClientException e) {
111
			org.txm.rcpapplication.utils.Logger.printStackTrace(e);
112
		}
113
	}
114

  
115
	/**
116
	 * Instantiates a new compute correspondence analysis dialog.
117
	 *
118
	 * @param parentShell the parent shell
119
	 * @param corpus the corpus
120
	 * @param title the title
121
	 * @param mess the mess
122
	 */
123
	public LexicalTableDialog(Shell parentShell,
124
			Corpus corpus, String title, String mess) {
125
		super(parentShell);
126
		this.corpus = corpus;
127
		this.title = title;
128
		this.mess = mess;
129
		try {
130
			this.properties = new ArrayList<Property>(corpus.getOrderedProperties());
131
		} catch (CqiClientException e) {
132
			org.txm.rcpapplication.utils.Logger.printStackTrace(e);
133
		}
134
	}
135

  
136
	/* (non-Javadoc)
137
	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
138
	 */
139
	@Override
140
	protected void configureShell(Shell newShell) {
141
		super.configureShell(newShell);
142
		newShell.setText(LexicalTableUIMessages.LexicalTablePreferencePage_0);
143
		if (title != null)
144
			newShell.setText(title);
145
	}
146

  
147
	/* (non-Javadoc)
148
	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
149
	 */
150
	@Override
151
	protected Control createDialogArea(Composite parent) {
152
		Composite composite = new Composite(parent, SWT.NONE);
153
		GridLayout layout = new GridLayout(2, false);
154
		composite.setLayout(layout);
155

  
156
		Label anaPropLabel = new Label(composite, SWT.NONE);
157
		if (mess != null)
158
			anaPropLabel.setText(mess);
159
		else
160
			anaPropLabel
161
					.setText(Messages.Property);
162
		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
163
				false, false));
164

  
165
		anaPropCombo = new Combo(composite, SWT.READ_ONLY);
166
		anaPropCombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
167
				true, false));
168
		int iword= 0;
169
		int i = 0;
170
		for (Property p : properties) {
171
			anaPropCombo.add(p.getName());
172
			if (p.getName().equals("word")) //$NON-NLS-1$
173
				iword=i;
174
			i++;
175
		}
176
		anaPropCombo.select(iword);
177

  
178
		maxlinesLabel = new Label(composite, SWT.NONE);
179
		maxlinesLabel.setText(Messages.NumberOfLines);
180
		maxlinesLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
181
				true, false));
182
		maxlinesSpinner = new Spinner(composite, SWT.BORDER);
183
		maxlinesSpinner.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
184
		maxlinesSpinner.setMaximum(9999999);
185
		maxlinesSpinner.setMinimum(1);
186
		maxlinesSpinner.setSelection(9999999);
187
		maxlinesSpinner.setSelection(vmax);
188
		
189
		fminLabel = new Label(composite, SWT.NONE);
190
		fminLabel.setText(TXMCoreMessages.FMIN_1);
191
		fminLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
192
				true, false));
193
		fminSpinner = new Spinner(composite, SWT.BORDER);
194
		fminSpinner.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
195
		fminSpinner.setMaximum(9999999);
196
		fminSpinner.setMinimum(1);
197
		fminSpinner.setSelection(fmin);
198

  
199
		return composite;
200
	}
201

  
202
	/* (non-Javadoc)
203
	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
204
	 */
205
	@Override
206
	protected void okPressed() {
207
		int propIndex = anaPropCombo.getSelectionIndex();
208
		if (propIndex == -1) {
209
			MessageDialog.openError(getShell(),
210
					Messages.Invalid_analysis_property,
211
					Messages.Structure_field_not_empty);
212
			return;
213
		}
214
		property = properties.get(propIndex);
215

  
216
		vmax = maxlinesSpinner.getSelection();
217
		fmin = fminSpinner.getSelection();
218
		super.okPressed();
219
	}
220

  
221
	/**
222
	 * Gets the property.
223
	 *
224
	 * @return the property
225
	 */
226
	public Property getProperty() {
227
		return property;
228
	}
229

  
230
	/**
231
	 * Gets the fmin.
232
	 *
233
	 * @return the fmin
234
	 */
235
	public int getFmin() {
236
		return fmin;
237
	}
238

  
239
	/**
240
	 * Gets the max lines.
241
	 *
242
	 * @return the max lines
243
	 */
244
	public int getMaxLines() {
245
		return vmax;
246
	}
247
	
248
	public void setFminAndVMax(int fmin, int vmax) {
249
		this.fmin = fmin;
250
		this.vmax = vmax;
251
	}
252
}
0 253

  
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LineContentProvider.java (revision 242)
29 29

  
30 30
import org.eclipse.jface.viewers.IStructuredContentProvider;
31 31
import org.eclipse.jface.viewers.Viewer;
32
import org.txm.stat.data.LexicalTable;
32
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
33 33

  
34 34
// TODO: Auto-generated Javadoc
35 35
/**
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java (revision 242)
41 41
import org.eclipse.ui.IEditorSite;
42 42
import org.eclipse.ui.PartInitException;
43 43
import org.eclipse.ui.part.EditorPart;
44
import org.txm.rcpapplication.Messages;
44
import org.txm.core.messages.TXMCoreMessages;
45 45
import org.txm.rcpapplication.editors.TableKeyListener;
46
import org.txm.searchengine.cqp.corpus.Lexicon;
47 46
import org.txm.searchengine.cqp.corpus.Property;
48 47

  
49 48
/**
50 49
 * The Class LexicalTableEditor.
51 50
 */
51
//FIXME: unused?
52 52
public class LexicalTableEditor extends EditorPart {
53 53

  
54 54
	/**
......
62 62
	public static final String ID = "LexicalTableEditor"; //$NON-NLS-1$
63 63

  
64 64
	/**
65
	 * Do save.
66
	 *
67
	 * @param arg0 the arg0
68
	 * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
69
	 */
70
	@Override
71
	public void doSave(IProgressMonitor arg0) {
72
		// TODO Auto-generated method stub
73
	}
74

  
75
	/**
76
	 * Do save as.
77
	 *
78
	 * @see org.eclipse.lyon gournd zeroui.part.EditorPart#doSaveAs()
79
	 */
80
	@Override
81
	public void doSaveAs() {
82
		// TODO Auto-generated method stub
83
	}
84

  
85
	/**
86
	 * Inits the.
87
	 *
88
	 * @param site the site
89
	 * @param input the input
90
	 * @throws PartInitException the part init exception
91
	 * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite,
92
	 * org.eclipse.ui.IEditorInput)
93
	 */
94
	@Override
95
	public void init(IEditorSite site, IEditorInput input)
96
			throws PartInitException {
97
		setSite(site);
98
		setInput(input);
99
	}
100

  
101
	/**
102
	 * Checks if is dirty.
103
	 *
104
	 * @return true, if is dirty
105
	 * @see org.eclipse.ui.part.EditorPart#isDirty()
106
	 */
107
	@Override
108
	public boolean isDirty() {
109
		return false;
110
	}
111

  
112
	/**
113
	 * Checks if is save as allowed.
114
	 *
115
	 * @return true, if is save as allowed
116
	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
117
	 */
118
	@Override
119
	public boolean isSaveAsAllowed() {
120
		return false;
121
	}
122

  
123
	/**
124 65
	 * Creates the part control.
125 66
	 *
126 67
	 * @param parent the parent
......
131 72
		GridLayout parentLayout = new GridLayout(1, false);
132 73
		parent.setLayout(parentLayout);
133 74

  
134
		Lexicon lexicon = null; // ((LexicalTableEditorInput)getEditorInput()).getLexicon();
135
		Property property = ((LexicalTableEditorInput) getEditorInput())
136
				.getProperty();
75
//		Lexicon lexicon = null; // ((LexicalTableEditorInput)getEditorInput()).getLexicon();
76
		Property property = ((LexicalTableEditorInput) getEditorInput()).getProperty();
137 77

  
138 78
		Composite corpusInfo = new Composite(parent, SWT.NONE);
139 79
		GridLayout corpusInfoLayout = new GridLayout(1, false);
140 80
		corpusInfo.setLayout(corpusInfoLayout);
141 81

  
142 82
		Label propertyLabel = new Label(corpusInfo, SWT.NONE);
143
		propertyLabel.setText(Messages.LexicalTable_1 + property.getName());
83
		propertyLabel.setText(TXMCoreMessages.PROPERTY_1 + property.getName());
144 84
		propertyLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
145 85
				false, false));
146 86

  
......
194 134
		getSite().setSelectionProvider(tableViewer);
195 135
	}
196 136

  
197
	/**
198
	 * Sets the focus.
199
	 *
200
	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
201
	 */
202 137
	@Override
203 138
	public void setFocus() {
204 139
	}
140
	
141
	@Override
142
	public void doSave(IProgressMonitor arg0) {
143
		// TODO Auto-generated method stub
144
	}
145

  
146
	@Override
147
	public void doSaveAs() {
148
		// TODO Auto-generated method stub
149
	}
150

  
151
	@Override
152
	public void init(IEditorSite site, IEditorInput input)
153
			throws PartInitException {
154
		setSite(site);
155
		setInput(input);
156
	}
157

  
158
	@Override
159
	public boolean isDirty() {
160
		return false;
161
	}
162

  
163
	@Override
164
	public boolean isSaveAsAllowed() {
165
		return false;
166
	}
167

  
168

  
205 169
}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditorInput.java (revision 242)
30 30
import java.util.ArrayList;
31 31
import java.util.List;
32 32

  
33
import org.eclipse.jface.resource.ImageDescriptor;
34 33
import org.eclipse.jface.viewers.IStructuredContentProvider;
35 34
import org.eclipse.jface.viewers.ITableLabelProvider;
36 35
import org.eclipse.jface.viewers.LabelProvider;
......
38 37
import org.eclipse.osgi.util.NLS;
39 38
import org.eclipse.swt.graphics.Image;
40 39
import org.eclipse.ui.IEditorInput;
41
import org.eclipse.ui.IPersistableElement;
42 40
import org.eclipse.ui.part.EditorPart;
43
import org.eclipse.ui.plugin.AbstractUIPlugin;
44
import org.txm.rcpapplication.Application;
45
import org.txm.rcpapplication.IImageKeys;
41
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
42
import org.txm.rcp.editors.TXMResultEditorInput;
46 43
import org.txm.rcpapplication.Messages;
47 44
import org.txm.rcpapplication.editors.Tablable;
48 45
import org.txm.rcpapplication.editors.TableEditor;
49 46
import org.txm.rcpapplication.editors.input.AbstractTablable;
50
import org.txm.searchengine.cqp.corpus.Partition;
51 47
import org.txm.searchengine.cqp.corpus.Property;
52
import org.txm.stat.StatException;
53
import org.txm.stat.data.LexicalTable;
48
import org.txm.statsengine.core.StatException;
54 49
// TODO: Auto-generated Javadoc
55 50
/**
56 51
 * The Class LexicalTableEditorInput.
57 52
 *
58 53
 * @author sloiseau
59 54
 */
60
public class LexicalTableEditorInput implements IEditorInput {
55
public class LexicalTableEditorInput extends TXMResultEditorInput {
61 56

  
62
	/** The lexical table. */
63
	private LexicalTable lexicalTable;
64
	
65
	/** The property. */
66
	private Property property;
67

  
68 57
	/** The editors. */
69 58
	private List<EditorPart> editors;
70 59
	
......
78 67
	 * @param partition the partition
79 68
	 * @param property the property
80 69
	 */
81
	public LexicalTableEditorInput(final LexicalTable table,
82
			Partition partition, Property property) {
83
		this.lexicalTable = table;
84
		this.property = property;
85

  
70
	public LexicalTableEditorInput(final LexicalTable table) {
71
		super(table);
72
		
86 73
		editors = new ArrayList<EditorPart>();
87 74
		editors.add(new TableEditor());
88 75

  
......
167 154

  
168 155
	}
169 156

  
170
	/**
171
	 * Instantiates a new lexical table editor input.
172
	 *
173
	 * @param lt the lt
174
	 */
175
	public LexicalTableEditorInput(LexicalTable lt) {
176
		this(lt, lt.getPartition(), lt.getProperty());
177
	}
178 157

  
179 158
	/**
180
	 * Exists.
181
	 *
182
	 * @return true, if successful
183
	 * @see org.eclipse.ui.IEditorInput#exists()
184
	 */
185
	@Override
186
	public boolean exists() {
187
		return false;
188
	}
189

  
190
	/**
191
	 * Gets the image descriptor.
192
	 *
193
	 * @return the image descriptor
194
	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
195
	 */
196
	@Override
197
	public ImageDescriptor getImageDescriptor() {
198
		return AbstractUIPlugin.imageDescriptorFromPlugin(
199
				Application.PLUGIN_ID, IImageKeys.LEXICALTABLE);
200
	}
201

  
202
	/**
203
	 * Gets the name.
204
	 *
205
	 * @return the name
206
	 * @see org.eclipse.ui.IEditorInput#getName()
207
	 */
208
	@Override
209
	public String getName() {
210
		return this.lexicalTable.getProperty().toString();
211
	}
212

  
213
	/**
214
	 * Gets the persistable.
215
	 *
216
	 * @return the persistable
217
	 * @see org.eclipse.ui.IEditorInput#getPersistable()
218
	 */
219
	@Override
220
	public IPersistableElement getPersistable() {
221
		return null;
222
	}
223

  
224
	/**
225
	 * Gets the tool tip text.
226
	 *
227
	 * @return the tool tip text
228
	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
229
	 */
230
	@Override
231
	public String getToolTipText() {
232
		return getName();
233
	}
234

  
235
	/**
236
	 * Gets the adapter.
237
	 *
238
	 * @param arg0 the arg0
239
	 * @return the adapter
240
	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
241
	 */
242
	@Override
243
	@SuppressWarnings("unchecked") //$NON-NLS-1$
244
	public Object getAdapter(Class arg0) {
245
		return null;
246
	}
247

  
248
	/**
249 159
	 * Gets the lexical table.
250 160
	 *
251 161
	 * @return the lexicon
252 162
	 */
253 163
	public LexicalTable getLexicalTable() {
254
		return lexicalTable;
164
		return (LexicalTable) this.result;
255 165
	}
256 166

  
257 167
	/**
......
260 170
	 * @return the property
261 171
	 */
262 172
	public Property getProperty() {
263
		return property;
173
		return this.getLexicalTable().getProperty();
264 174
	}
265 175

  
266 176
}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor2.java (revision 242)
61 61
import org.eclipse.ui.IEditorInput;
62 62
import org.eclipse.ui.IEditorSite;
63 63
import org.eclipse.ui.PartInitException;
64
import org.eclipse.ui.part.EditorPart;
64
import org.txm.core.messages.TXMCoreMessages;
65
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
65 66
import org.txm.lexicaltable.rcp.handlers.MergeLines;
67
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
68
import org.txm.rcp.editors.TXMEditorPart;
66 69
import org.txm.rcpapplication.Messages;
67 70
import org.txm.rcpapplication.StatusLine;
68 71
import org.txm.rcpapplication.commands.editor.CustomizableEditor;
......
73 76
import org.txm.rcpapplication.views.corpora.CorporaView;
74 77
import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
75 78
import org.txm.searchengine.cqp.corpus.Corpus;
76
import org.txm.stat.StatException;
77
import org.txm.stat.data.LexicalTable;
78
import org.txm.stat.data.Vector;
79
import org.txm.stat.engine.r.RWorkspaceException;
79
import org.txm.statsengine.core.StatException;
80
import org.txm.statsengine.core.data.Vector;
81
import org.txm.statsengine.r.core.RWorkspaceException;
80 82
// TODO: Auto-generated Javadoc
81 83
/**
82 84
 * display the lexical table tools to merge/delete lines or columns and display
83 85
 * the lexical table too
84 86
 * @author mdecorde
85 87
 */
86
public class LexicalTableEditor2 extends EditorPart implements CustomizableEditor{
88
public class LexicalTableEditor2 extends TXMEditorPart implements CustomizableEditor	{
87 89

  
88 90
	
89 91
	public static final String ID = "LexicalTableEditor"; //$NON-NLS-1$
......
152 154
	private Object source;
153 155

  
154 156
	/**
155
	 * Do save.
156
	 *
157
	 * @param arg0 the arg0
158
	 * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
159
	 */
160
	@Override
161
	public void doSave(IProgressMonitor arg0) {
162

  
163
	}
164

  
165
	/**
166
	 * Do save as.
167
	 *
168
	 * @see org.eclipse.lyon gournd zeroui.part.EditorPart#doSaveAs()
169
	 */
170
	@Override
171
	public void doSaveAs() {
172

  
173
	}
174

  
175
	/**
176 157
	 * Inits the.
177 158
	 *
178 159
	 * @param site the site
......
182 163
	 * org.eclipse.ui.IEditorInput)
183 164
	 */
184 165
	@Override
185
	public void init(IEditorSite site, IEditorInput input)
186
			throws PartInitException {
187
		setSite(site);
188
		setInput(input);
189

  
166
	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
167
		super.init(site, input);
168
		
190 169
		table = ((LexicalTableEditorInput) input).getLexicalTable();
191 170
	}
192 171

  
193
	/**
194
	 * Checks if is dirty.
195
	 *
196
	 * @return true, if is dirty
197
	 * @see org.eclipse.ui.part.EditorPart#isDirty()
198
	 */
199
	@Override
200
	public boolean isDirty() {
201
		return false;
202
	}
172
	
203 173

  
204 174
	/**
205
	 * Checks if is save as allowed.
206
	 *
207
	 * @return true, if is save as allowed
208
	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
209
	 */
210
	@Override
211
	public boolean isSaveAsAllowed() {
212
		return false;
213
	}
214

  
215
	/**
216 175
	 * Sort.
217 176
	 *
218 177
	 * @param col the col
......
231 190
		} else if (index == -1) { // freqs
232 191
			try {
233 192
				table.sortByFreqs(reverse);
234
				StatusLine.setMessage(Messages.IndexEditor_37);
193
				StatusLine.setMessage(Messages.SORT_DONE);
235 194
			} catch (Exception e2) {
236 195
				org.txm.rcpapplication.utils.Logger.printStackTrace(e2);
237 196
			}
......
258 217
	 */
259 218
	@Override
260 219
	public void createPartControl(final Composite parent) {
220
		
221
		//FIXME: to do
222
		//super.createPartControl(parent);
223
		
224
		
261 225
		FormLayout parentLayout = new FormLayout();
262 226
		parent.setLayout(parentLayout);
263 227

  
......
277 241
		refreshInfos();
278 242

  
279 243
		Button keepTop = new Button(paramArea, SWT.PUSH);
280
		keepTop.setText(Messages.LexicalTableEditor_4);
244
		keepTop.setText(LexicalTableUIMessages.LexicalTableEditor_4);
281 245
		keepTop.addSelectionListener(new SelectionListener() {
282 246
			@Override
283 247
			public void widgetSelected(SelectionEvent e) {
284
				StatusLine.setMessage(Messages.LexicalTableEditor_16);
285
				System.out.println(NLS.bind(Messages.LexicalTableEditor_5, topSpinner.getSelection(), minfreqspinner.getSelection()));
248
				StatusLine.setMessage(LexicalTableUIMessages.LexicalTableEditor_16);
249
				System.out.println(NLS.bind(LexicalTableUIMessages.LexicalTableEditor_5, topSpinner.getSelection(), minfreqspinner.getSelection()));
286 250

  
287 251
				MessageBox messageBox = new MessageBox(e.display
288 252
						.getActiveShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO);
......
308 272
			}
309 273
		});
310 274
		infos = new Label(paramArea, SWT.NONE);
311
		infos.setText(Messages.LexicalTableEditor_8);
275
		infos.setText(LexicalTableUIMessages.LexicalTableEditor_8);
312 276
		topSpinner = new Spinner(paramArea, SWT.BORDER);
313 277

  
314 278
		infos = new Label(paramArea, SWT.NONE);
315
		infos.setText(Messages.LexicalTableEditor_6);
279
		infos.setText(LexicalTableUIMessages.LexicalTableEditor_6);
316 280
		minfreqspinner = new Spinner(paramArea, SWT.BORDER);
317 281

  
318 282
		Button fusionCol = new Button(paramArea, SWT.PUSH);
319
		fusionCol.setText(Messages.LexicalTableEditor_10);
283
		fusionCol.setText(LexicalTableUIMessages.LexicalTableEditor_10);
320 284
		fusionCol.addSelectionListener(new SelectionListener() {
321 285
			@Override
322 286
			public void widgetSelected(SelectionEvent e) {
323
				StatusLine.setMessage(Messages.LexicalTableEditor_18);
287
				StatusLine.setMessage(LexicalTableUIMessages.LexicalTableEditor_18);
324 288
				ArrayList<Object> selection = new ArrayList<Object>();
325 289
				MergeDeleteDialog d = new MergeDeleteDialog(e.display
326 290
						.getActiveShell(), new ArrayList<Object>(collist),
......
336 300
					if (d.doMerge()) {
337 301
						String newname = d.getMergeName();
338 302

  
339
						System.out.println(NLS.bind(Messages.LexicalTableEditor_11, colindices));
303
						System.out.println(NLS.bind(LexicalTableUIMessages.LexicalTableEditor_11, colindices));
340 304
						double[] firstcol = cols.get(colindices.get(0));
341 305

  
342 306
						// merge selected cols into the first one
......
383 347
						refreshTable();
384 348
					} else// delete
385 349
					{
386
						System.out.println(NLS.bind(Messages.LexicalTableEditor_12, colindices));
350
						System.out.println(NLS.bind(LexicalTableUIMessages.LexicalTableEditor_12, colindices));
387 351
						table.removeCols(colindices);
388 352

  
389 353
						collist = new ArrayList<Object>();
......
414 378
		});
415 379

  
416 380
		Button mergeDeleteRows = new Button(paramArea, SWT.PUSH);
417
		mergeDeleteRows.setText(Messages.LexicalTableEditor_13);
381
		mergeDeleteRows.setText(LexicalTableUIMessages.LexicalTableEditor_13);
418 382
		mergeDeleteRows.addSelectionListener(new SelectionListener() {
419 383
			@Override
420 384
			public void widgetSelected(SelectionEvent e) {
......
521 485
		viewer.setInput(table);
522 486
		parent.layout();
523 487

  
524
		if (table != null) {
525
			setPartName(table.getPartition().getName()+": "+table.getName()); //$NON-NLS-1$
526
		}
527

  
528 488
		viewer.refresh();
529 489
		viewer.getTable().setSortColumn(formColumn.getColumn());
530 490
		viewer.getTable().setSortDirection(SWT.UP);
......
543 503

  
544 504
	private void refreshInfos() {
545 505
		try {
546
			infos.setText(Messages.IndexEditor_27 + table.getTotal()
547
					+ Messages.IndexEditor_28 + table.getNRows()
548
					+ Messages.LexicalTableEditor_2 + table.getFmin()
549
					+ Messages.LexicalTableEditor_3 + table.getFmax());
506
			infos.setText(TXMCoreMessages.T + table.getTotal()
507
					+ TXMCoreMessages.V + table.getNRows()
508
					+ TXMCoreMessages.FMIN_2 + table.getFmin()
509
					+ TXMCoreMessages.FMAX_2 + table.getFmax());
550 510
			infos.redraw();
551 511
			infos.getParent().layout();
552 512
		} catch (RWorkspaceException e3) {
......
670 630
		 */
671 631
		@Override
672 632
		public void widgetSelected(SelectionEvent e) {
673
			StatusLine.setMessage(Messages.IndexEditor_36);
633
			StatusLine.setMessage(Messages.SORT_COLUMN);
674 634
			sort(col, index);
675 635
			StatusLine.setMessage(""); //$NON-NLS-1$
676 636
		}
......
724 684
				String[] colnames = table.getColNames().asStringsArray();
725 685
				TableColumn[] cols = viewer.getTable().getColumns();
726 686
				if (colnames.length > cols.length) {
727
					System.out.println(Messages.LexicalTableEditor_1+Arrays.toString(cols)+Messages.LexicalTableEditor_7+Arrays.toString(colnames)+" ");  //$NON-NLS-1$
687
					System.out.println(LexicalTableUIMessages.LexicalTableEditor_1+Arrays.toString(cols)+LexicalTableUIMessages.LexicalTableEditor_7+Arrays.toString(colnames)+" ");  //$NON-NLS-1$
728 688
					return;
729 689
				}
730 690
				for (int i = 0; i < colnames.length ; i++) {
......
736 696
				viewer.getTable().getParent().layout();
737 697
				refreshTable();
738 698
			} else {
739
				System.out.println(Messages.LexicalTableEditor_14);
699
				System.out.println(LexicalTableUIMessages.LexicalTableEditor_14);
740 700
			}
741 701
		} catch(Exception e) {
742
			System.out.println(Messages.LexicalTableEditor_15+e);
702
			System.out.println(LexicalTableUIMessages.LexicalTableEditor_15+e);
743 703
			org.txm.rcpapplication.utils.Logger.printStackTrace(e);
744 704
		}
745 705
	}
......
796 756
		// TODO Auto-generated method stub
797 757
		return false;
798 758
	}
759
	
760
	/**
761
	 * Do save.
762
	 *
763
	 * @param arg0 the arg0
764
	 * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
765
	 */
766
	@Override
767
	public void doSave(IProgressMonitor arg0) {
768

  
769
	}
770

  
771
	/**
772
	 * Do save as.
773
	 *
774
	 * @see org.eclipse.lyon gournd zeroui.part.EditorPart#doSaveAs()
775
	 */
776
	@Override
777
	public void doSaveAs() {
778

  
779
	}
780

  
781

  
782
	/**
783
	 * Checks if is dirty.
784
	 *
785
	 * @return true, if is dirty
786
	 * @see org.eclipse.ui.part.EditorPart#isDirty()
787
	 */
788
	@Override
789
	public boolean isDirty() {
790
		return false;
791
	}
792

  
793
	/**
794
	 * Checks if is save as allowed.
795
	 *
796
	 * @return true, if is save as allowed
797
	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
798
	 */
799
	@Override
800
	public boolean isSaveAsAllowed() {
801
		return false;
802
	}
803

  
799 804
}
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LineLabelProvider.java (revision 242)
35 35
import org.eclipse.jface.viewers.LabelProvider;
36 36
import org.eclipse.swt.graphics.Image;
37 37
import org.txm.cooccurrence.rcp.preferences.CoocPreferencePage;
38
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
38 39
import org.txm.rcpapplication.TxmPreferences;
39
import org.txm.stat.data.LexicalTable;
40 40

  
41 41
// TODO: Auto-generated Javadoc
42 42
/**
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java (revision 242)
31 31
import java.util.List;
32 32

  
33 33
import org.apache.batik.util.gui.CSSMediaPanel.Dialog;
34
import org.eclipse.core.commands.AbstractHandler;
35 34
import org.eclipse.core.commands.ExecutionEvent;
36 35
import org.eclipse.core.commands.ExecutionException;
37 36
import org.eclipse.core.runtime.IProgressMonitor;
......
47 46
import org.eclipse.ui.PartInitException;
48 47
import org.eclipse.ui.dialogs.ListDialog;
49 48
import org.eclipse.ui.handlers.HandlerUtil;
50
import org.txm.Toolbox;
51 49
import org.txm.core.preferences.TXMPreferences;
52 50
//import org.txm.functions.queryindex.QueryIndex;
53 51
import org.txm.index.core.functions.Index;
52
import org.txm.lexicaltable.core.functions.LexicalTableFactory;
54 53
import org.txm.lexicaltable.core.preferences.LexicalTablePreferences;
55
import org.txm.lexicaltable.functions.LexicalTableFactory;
54
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
55
import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
56
import org.txm.lexicaltable.rcp.editors.LexicalTableDialog;
56 57
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
57 58
import org.txm.lexicaltable.rcp.editors.LexicalTableEditorInput;
59
import org.txm.rcp.handlers.BaseAbstractHandler;
58 60
import org.txm.rcpapplication.JobsTimer;
59 61
import org.txm.rcpapplication.Messages;
60 62
import org.txm.rcpapplication.StatusLine;
61
import org.txm.rcpapplication.actions.LexicalTableDialog;
62 63
import org.txm.rcpapplication.utils.JobHandler;
63 64
import org.txm.rcpapplication.views.QueriesView;
64
import org.txm.rcpapplication.views.RVariablesView;
65 65
import org.txm.rcpapplication.views.corpora.CorporaView;
66 66
import org.txm.searchengine.cqp.corpus.Partition;
67 67
import org.txm.searchengine.cqp.corpus.Property;
68
import org.txm.stat.data.LexicalTable;
69
import org.txm.stat.engine.r.data.LexicalTableImpl;
70
import org.txm.stat.engine.r.data.QuantitativeDataStructureImpl;
68
import org.txm.statsengine.r.core.data.QuantitativeDataStructureImpl;
69
import org.txm.statsengine.r.rcp.views.RVariablesView;
71 70
import org.txm.utils.logger.Log;
72 71
// TODO: Auto-generated Javadoc
73 72
/**
......
75 74
 * the selection is a index : creates a lexical table with the Index
76 75
 * entries @ author mdecorde.
77 76
 */
78
public class ComputeLexicalTable extends AbstractHandler {
77
public class ComputeLexicalTable extends BaseAbstractHandler {
79 78

  
80 79
	
81 80
	static	{
......
105 104
	@Override
106 105
	public Object execute(ExecutionEvent event) throws ExecutionException {
107 106

  
108
		if (!Toolbox.isStatEngineInitialized()) {
109
			System.out.println(Messages.ComputeLexicalTable_4);
107
		if(!this.checkStatsEngine()) {
110 108
			return null;
111 109
		}
112 110

  
111

  
113 112
		window = HandlerUtil.getActiveWorkbenchWindow(event);
114 113
		selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
115 114

  
......
191 190
						@Override
192 191
						public void run() {
193 192
							IWorkbenchPage page = window.getActivePage();
194
							LexicalTableEditorInput editorInput = new LexicalTableEditorInput(
195
									table, null, null);
193
							LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
196 194
							try {
197 195
								StatusLine.setMessage(Messages.ComputeLexicalTable_10);
198
								page.openEditor(editorInput, "LexicalTableEditor"); //$NON-NLS-1$
196
								page.openEditor(editorInput, LexicalTableEditor2.ID);
199 197
							} catch (PartInitException e) {
200 198
								org.txm.rcpapplication.utils.Logger.printStackTrace(e);
201 199
							} 
......
287 285
							@Override
288 286
							public void run() {
289 287
								IWorkbenchPage page = window.getActivePage();
290
								LexicalTableEditorInput editorInput = new LexicalTableEditorInput(
291
										table, partition, property);
288
								LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
292 289
								try {
293 290
									StatusLine.setMessage(Messages.ComputeLexicalTable_10);
294 291
									page.openEditor(editorInput, LexicalTableEditor2.ID); //$NON-NLS-1$
......
464 461
			}
465 462
		}
466 463
		
467
		final Partition partition = firstIndex.getPartition();
468 464
		final Property property = properties.get(0);
469 465

  
470 466
		JobHandler jobhandler = new JobHandler(Messages.bind(Messages.ComputeLexicalTable_0, firstIndex.getName())) {
......
474 470
				try {
475 471
					monitor.beginTask("Computing Lexical table with Index: "+firstIndex+" property: "+property, 100);
476 472
					this.acquireSemaphore();
477
					table = LexicalTableImpl.createLexicalTableImpl(vocabularies,
478
							QuantitativeDataStructureImpl
479
							.createSymbole(LexicalTableImpl.class), useAllOccurrences);
473
					table = LexicalTableImpl.createLexicalTableImpl(vocabularies, QuantitativeDataStructureImpl.createSymbole(LexicalTableImpl.class), useAllOccurrences);
480 474
					monitor.worked(45);
481 475
					this.releaseSemaphore();
482 476
					if (monitor.isCanceled() || table == null)
......
490 484
						@Override
491 485
						public void run() {
492 486
							IWorkbenchPage page = window.getActivePage();
493
							LexicalTableEditorInput editorInput = new LexicalTableEditorInput(
494
									table, partition, property);
487
							LexicalTableEditorInput editorInput = new LexicalTableEditorInput(table);
495 488
							try {
496 489
								StatusLine.setMessage(Messages.ComputeLexicalTable_10);
497 490
								page.openEditor(editorInput,
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java (revision 242)
38 38
import org.eclipse.swt.widgets.Shell;
39 39
import org.eclipse.ui.IWorkbenchPart;
40 40
import org.eclipse.ui.handlers.HandlerUtil;
41
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
41 42
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
43
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
42 44
import org.txm.rcpapplication.Messages;
43 45
import org.txm.rcpapplication.StatusLine;
44
import org.txm.stat.data.LexicalTable;
45 46
// TODO: Auto-generated Javadoc
46 47
/**
47 48
 * Allow the user to merge Lexical Table lines columns values are added to the
......
92 93
	static public void mergeLines(LexicalTableEditor2 LTeditor, String newname,
93 94
			int[] selection) {
94 95
		// sum the lines
95
		StatusLine.setMessage(Messages.LexicalTableEditor_18);
96
		StatusLine.setMessage(LexicalTableUIMessages.LexicalTableEditor_18);
96 97
		List<double[]> cols = LTeditor.getCols();
97 98
		LexicalTable table = LTeditor.getLexicalTable();
98 99
		TableViewer lineTableViewer = LTeditor.getlineTableViewer();
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java (revision 242)
39 39
import org.eclipse.swt.widgets.Shell;
40 40
import org.eclipse.ui.IWorkbenchPart;
41 41
import org.eclipse.ui.handlers.HandlerUtil;
42
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
42 43
import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
43 44
import org.txm.rcpapplication.Messages;
44
import org.txm.stat.StatException;
45
import org.txm.stat.data.LexicalTable;
45
import org.txm.statsengine.core.StatException;
46 46
/**
47 47
 * The Class MergeCols.
48 48
 */
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/preferences/LexicalTablePreferencePage.java (revision 242)
31 31
import org.eclipse.ui.IWorkbench;
32 32
import org.txm.lexicaltable.core.preferences.LexicalTablePreferences;
33 33
import org.txm.lexicaltable.rcp.adapters.LexicalTableAdapterFactory;
34
import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
34 35
import org.txm.rcp.preferences.TXMPreferencePage;
35 36
import org.txm.rcp.preferences.TXMPreferenceStore;
36
import org.txm.rcpapplication.Messages;
37 37

  
38 38
/**
39
 * Lexical Table preference page.
39
 * Lexical Table preferences page.
40 40
 * @author mdecorde
41 41
 * @author sjacquot
42 42
 *
......
47 47
	@Override
48 48
	public void createFieldEditors() {
49 49
		
50
		IntegerFieldEditor fmin = new IntegerFieldEditor(LexicalTablePreferences.F_MIN, Messages.LexicalTablePreferencePage_1, this.getFieldEditorParent()); 
50
		IntegerFieldEditor fmin = new IntegerFieldEditor(LexicalTablePreferences.F_MIN, LexicalTableUIMessages.LexicalTablePreferencePage_1, this.getFieldEditorParent()); 
51 51
		fmin.setValidRange(1, 999999999);
52 52
		
53 53
		IntegerFieldEditor vmax = new IntegerFieldEditor(LexicalTablePreferences.V_MAX, "vmax", this.getFieldEditorParent()); 
......
61 61
	@Override
62 62
	public void init(IWorkbench workbench) {
63 63
		this.setPreferenceStore(new TXMPreferenceStore(LexicalTablePreferences.PREFERENCES_NODE));
64
		//this.setDescription(Messages.LexicalTablePreferencePage_0);
65
		this.setTitle(Messages.LexicalTablePreferencePage_0);
64
		this.setTitle(LexicalTableUIMessages.LexicalTablePreferencePage_0);
66 65
		this.setImageDescriptor(LexicalTableAdapterFactory.ICON);
67 66
	}
68 67

  
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/adapters/LexicalTableAdapterFactory.java (revision 242)
5 5
import org.eclipse.ui.model.IWorkbenchAdapter;
6 6
import org.eclipse.ui.plugin.AbstractUIPlugin;
7 7
import org.osgi.framework.FrameworkUtil;
8
import org.txm.lexicaltable.core.statsengine.data.LexicalTable;
8 9
import org.txm.rcp.adapters.TXMResultAdapter;
9 10
import org.txm.rcp.adapters.TXMResultAdapterFactory;
10
import org.txm.stat.data.LexicalTable;
11 11

  
12 12

  
13 13
/**
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java (revision 242)
1
package org.txm.lexicaltable.rcp.messages;
2

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

  
6
public class LexicalTableUIMessages extends NLS {
7

  
8
	private static final String BUNDLE_NAME = "org.txm.lexicaltable.rcp.messages.messages"; //$NON-NLS-1$
9

  
10

  
11
	public static String LexicalTableEditor_1;
12
	public static String LexicalTableEditor_10;
13
	public static String LexicalTableEditor_11;
14
	public static String LexicalTableEditor_12;
15
	public static String LexicalTableEditor_13;
16
	public static String LexicalTableEditor_14;
17
	public static String LexicalTableEditor_15;
18
	public static String LexicalTableEditor_16;
19
	public static String LexicalTableEditor_18;
20
	public static String LexicalTableEditor_4;
21
	public static String LexicalTableEditor_5;
22
	public static String LexicalTableEditor_6;
23
	public static String LexicalTableEditor_7;
24
	public static String LexicalTableEditor_8;
25
	public static String LexicalTablePreferencePage_0;
26
	public static String LexicalTablePreferencePage_1;
27

  
28
	//FIXME: unused keys
29
	public static String LexicalTableEditor_2;
30
	public static String LexicalTableEditor_3;
31
	// end of fixme
32
	
33
	static {
34
		// initialize resource bundle
35
		TXMCoreMessages.initializeMessages(BUNDLE_NAME, LexicalTableUIMessages.class);
36
	}
37

  
38
	private LexicalTableUIMessages() {
39
	}
40
}
0 41

  
tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages.properties (revision 242)
1

  
2
LexicalTableEditor_1  = ** Error: different columns number: before
3
LexicalTableEditor_10 = Merge or Delete columns
4
LexicalTableEditor_11 = Merge cols: {0}
5
LexicalTableEditor_12 = Delete cols: {0}
6
LexicalTableEditor_13 = Merge or Delete rows
7
LexicalTableEditor_14 = ** Failed to import lexical table
8
LexicalTableEditor_15 = ** Error while importing data:
9
LexicalTableEditor_16 = Filtering lines
10
LexicalTableEditor_18 = Merging lines
11
LexicalTableEditor_2  = , Fmin
12
LexicalTableEditor_3  = , Fmax
13
LexicalTableEditor_4  = Apply
14
LexicalTableEditor_5  = Keep: {0} lines, Fmin {1}
15
LexicalTableEditor_6  = Fmin:
16
LexicalTableEditor_7  = \ after
17
LexicalTableEditor_8  = Number of lines
18

  
19
LexicalTablePreferencePage_0 = Lexical table
20
LexicalTablePreferencePage_1 = Lowest frequency
0 21

  
... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff