Révision 2729
tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java (revision 2729) | ||
---|---|---|
561 | 561 |
} |
562 | 562 |
|
563 | 563 |
@Override |
564 |
public void setFocus() { |
|
564 |
public void _setFocus() {
|
|
565 | 565 |
// Give the focus to the query widget only if the result has not yet been computed (otherwise it breaks the synchronous Concordance/Edition) |
566 | 566 |
if (!this.getResult().hasBeenComputedOnce()) { |
567 | 567 |
if (queryWidget != null && !queryWidget.isDisposed()) { |
tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java (revision 2729) | ||
---|---|---|
1768 | 1768 |
* @see org.eclipse.ui.part.WorkbenchPart#setFocus() |
1769 | 1769 |
*/ |
1770 | 1770 |
@Override |
1771 |
public void setFocus() { |
|
1771 |
public void _setFocus() {
|
|
1772 | 1772 |
|
1773 | 1773 |
if (this.queryWidget == null) return; |
1774 | 1774 |
this.queryWidget.setFocus(); |
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/EigenvaluesTableEditor.java (revision 2729) | ||
---|---|---|
186 | 186 |
|
187 | 187 |
|
188 | 188 |
@Override |
189 |
public void setFocus() { |
|
189 |
public void _setFocus() {
|
|
190 | 190 |
viewer.getControl().setFocus(); |
191 | 191 |
} |
192 | 192 |
|
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java (revision 2729) | ||
---|---|---|
108 | 108 |
|
109 | 109 |
|
110 | 110 |
@Override |
111 |
public void setFocus() { |
|
111 |
public void _setFocus() {
|
|
112 | 112 |
this.parentMultiPagesEditor.setFocus(); |
113 | 113 |
} |
114 | 114 |
|
tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java (revision 2729) | ||
---|---|---|
58 | 58 |
*/ |
59 | 59 |
private TableViewer viewer; |
60 | 60 |
|
61 |
|
|
61 |
|
|
62 | 62 |
/** |
63 | 63 |
* |
64 | 64 |
* @param result |
65 | 65 |
*/ |
66 | 66 |
public ColsRowsInfosEditor(TXMResult result, final String tabTooltip) { |
67 | 67 |
super(new TXMResultEditorInput<TXMResult>(result) { |
68 |
|
|
68 | 69 |
@Override |
69 | 70 |
public String getToolTipText() { |
70 | 71 |
return tabTooltip; |
71 | 72 |
} |
72 | 73 |
}); |
73 | 74 |
} |
74 |
|
|
75 | 75 |
|
76 |
|
|
76 | 77 |
@Override |
77 | 78 |
public void _createPartControl() { |
78 | 79 |
|
... | ... | |
89 | 90 |
Table table = viewer.getTable(); |
90 | 91 |
table.setHeaderVisible(true); |
91 | 92 |
table.setLinesVisible(true); |
92 |
|
|
93 |
|
|
93 | 94 |
String[] titles = this.getTableTitles(); |
94 | 95 |
|
95 |
//List<String> coltypes = new ArrayList<String>(); |
|
96 |
// coltypes.add(TXMUIMessages.integer);
|
|
97 |
// coltypes.add("");
|
|
98 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
99 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
100 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
101 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
102 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
103 |
// for (int c = 0; c < 3; c++)// seulement les 3 premiers axes
|
|
104 |
// {
|
|
105 |
// coltypes.add(CAEditor.SEPARATOR);
|
|
106 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
107 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
108 |
// }
|
|
109 |
// coltypes.add(CAEditor.SEPARATOR);
|
|
110 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
111 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
112 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
113 |
// coltypes.add(CAEditor.SEPARATOR);
|
|
114 |
//
|
|
115 |
//String[] types = coltypes.toArray(new String[] {}); |
|
96 |
// List<String> coltypes = new ArrayList<String>();
|
|
97 |
// coltypes.add(TXMUIMessages.integer);
|
|
98 |
// coltypes.add("");
|
|
99 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
100 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
101 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
102 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
103 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
104 |
// for (int c = 0; c < 3; c++)// seulement les 3 premiers axes
|
|
105 |
// {
|
|
106 |
// coltypes.add(CAEditor.SEPARATOR);
|
|
107 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
108 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
109 |
// }
|
|
110 |
// coltypes.add(CAEditor.SEPARATOR);
|
|
111 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
112 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
113 |
// coltypes.add(CAEditor.COL_TYPE);
|
|
114 |
// coltypes.add(CAEditor.SEPARATOR);
|
|
115 |
//
|
|
116 |
// String[] types = coltypes.toArray(new String[] {});
|
|
116 | 117 |
|
117 | 118 |
|
118 | 119 |
for (int i = 0; i < titles.length; i++) { |
... | ... | |
126 | 127 |
} |
127 | 128 |
column.getColumn().setText(titles[i]); |
128 | 129 |
} |
129 |
|
|
130 |
|
|
130 | 131 |
viewer.setContentProvider(ArrayContentProvider.getInstance()); |
131 | 132 |
viewer.setLabelProvider(new ColRowInfosLabelProvider(this.getTableTitles())); |
132 | 133 |
|
... | ... | |
139 | 140 |
|
140 | 141 |
// Register the context menu |
141 | 142 |
TXMEditor.initContextMenu(this.viewer.getTable(), this.getSite(), this.viewer); |
142 |
|
|
143 |
|
|
143 | 144 |
} |
144 |
|
|
145 |
|
|
145 |
|
|
146 |
|
|
146 | 147 |
/** |
147 | 148 |
* Gets the data to give to the viewer. |
149 |
* |
|
148 | 150 |
* @return |
149 | 151 |
*/ |
150 | 152 |
public abstract Object getTableInput(); |
151 | 153 |
|
152 | 154 |
/** |
153 | 155 |
* Gets the titles that will be used as column labels. |
156 |
* |
|
154 | 157 |
* @return |
155 | 158 |
*/ |
156 | 159 |
public abstract String[] getTableTitles(); |
... | ... | |
158 | 161 |
|
159 | 162 |
/** |
160 | 163 |
* Gets the ordered labels according to the current table sort. |
164 |
* |
|
161 | 165 |
* @return |
162 | 166 |
*/ |
163 |
public String[] getOrdererLabels() {
|
|
167 |
public String[] getOrdererLabels() {
|
|
164 | 168 |
|
165 | 169 |
TableItem[] items = this.viewer.getTable().getItems(); |
166 | 170 |
String[] labels = new String[items.length]; |
167 |
for(int i = 0; i < items.length; i++) { |
|
171 |
for (int i = 0; i < items.length; i++) {
|
|
168 | 172 |
labels[i] = items[i].getText(); |
169 | 173 |
} |
170 | 174 |
|
171 | 175 |
return labels; |
172 | 176 |
} |
173 | 177 |
|
174 |
|
|
175 |
/* (non-Javadoc) |
|
178 |
|
|
179 |
/* |
|
180 |
* (non-Javadoc) |
|
176 | 181 |
* @see org.eclipse.ui.part.WorkbenchPart#setFocus() |
177 | 182 |
*/ |
178 | 183 |
@Override |
179 |
public void setFocus() { |
|
184 |
public void _setFocus() {
|
|
180 | 185 |
viewer.getControl().setFocus(); |
181 | 186 |
} |
182 |
|
|
187 |
|
|
183 | 188 |
/** |
184 | 189 |
* @return the viewer |
185 | 190 |
*/ |
186 | 191 |
public TableViewer getViewer() { |
187 | 192 |
return viewer; |
188 | 193 |
} |
189 |
|
|
190 |
|
|
194 |
|
|
195 |
|
|
191 | 196 |
@Override |
192 | 197 |
public void updateResultFromEditor() { |
193 | 198 |
// TODO Auto-generated method stub |
194 | 199 |
|
195 | 200 |
} |
196 |
|
|
197 |
|
|
201 |
|
|
202 |
|
|
198 | 203 |
@Override |
199 | 204 |
public void updateEditorFromResult(boolean update) throws Exception { |
200 |
|
|
205 |
|
|
201 | 206 |
this.viewer.setInput(this.getTableInput()); |
202 | 207 |
|
203 | 208 |
// Pack the columns |
204 | 209 |
TXMEditor.packColumns(this.viewer); |
205 |
|
|
210 |
|
|
206 | 211 |
} |
207 | 212 |
|
208 | 213 |
|
209 |
|
|
210 |
} |
|
214 |
|
|
215 |
} |
tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_fr.properties (revision 2729) | ||
---|---|---|
13 | 13 |
failedToGetTheSpecificitesColon = ** Échec de l''accès aux spécificités dans R : {0}. |
14 | 14 |
|
15 | 15 |
info_specificitiesBarChartForTheP0LexcialTable = Diagramme à barres des spécificités de la table lexicale {0}... |
16 |
info_specificitiesBarChartForTheP0PartitionCommaP1Property = Diagramme à barres des spécificités de la la partition {0}, propriété {1}...
|
|
16 |
info_specificitiesBarChartForTheP0PartitionCommaP1Property = Diagramme à barres des spécificités de la partition {0}, propriété {1}... |
|
17 | 17 |
info_specificitiesBarChartForTheP0Subcorpus = Diagramme à barres des spécificités du sous-corpus {0}... |
18 | 18 |
info_specificitiesOfTheP0Corpus = Spécificités du sous-corpus {0}... |
19 | 19 |
info_specificitiesOfTheP0LexcialTable = Spécificités de la table lexicale {0}... |
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 2729) | ||
---|---|---|
2481 | 2481 |
this.computedOnce = true; |
2482 | 2482 |
|
2483 | 2483 |
if (this.altered) { |
2484 |
Log.finest(NLS.bind("TXMResult.compute(): Warning {0} modifications have been lost.", this.getSimpleName()));
|
|
2484 |
Log.info(NLS.bind("Warning {0} manual modifications have been lost.", this.getSimpleName()));
|
|
2485 | 2485 |
} |
2486 | 2486 |
this.altered = false; |
2487 | 2487 |
Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": computing of result type " + this.getClass() + " done."); |
... | ... | |
2493 | 2493 |
if ((!skipComputing |
2494 | 2494 |
|| this.altered) // FIXME: SJ: fix for computing LexicalTable children even if the LT is not dirty but only altered, need to define if it's a temporary fix or not |
2495 | 2495 |
// e.g. can't we use the dirty state rather than a new member "altered"? |
2496 |
&& this.hasChildren()) { |
|
2496 |
&& this.hasChildren() // don't bother if there is not child |
|
2497 |
&& this.parent != null) { // don't children cascade compute if parent == null (it is the Workspace (Tree root)) |
|
2497 | 2498 |
|
2498 | 2499 |
// monitor log |
2499 | 2500 |
mainSubMonitor.setTaskName(TXMCoreMessages.bind(TXMCoreMessages.info_computingChildrenOfP0P1, this, this.getClass().getSimpleName())); |
... | ... | |
2501 | 2502 |
// create a monitor for children computing loop |
2502 | 2503 |
SubMonitor loopMonitor = mainSubMonitor.split(1).setWorkRemaining(this.children.size()); |
2503 | 2504 |
|
2504 |
// set the children as dirty since the result has changed |
|
2505 |
for (int i = 0; i < this.children.size(); i++) { |
|
2506 |
this.children.get(i).setDirty(); |
|
2507 |
} |
|
2505 |
Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": cascade computing of " + this.children.size() + " child(ren)."); |
|
2508 | 2506 |
|
2509 |
// Children cascade computing (if parent == null then it is the Workspace (Tree root)) |
|
2510 |
if (this.parent != null) { |
|
2507 |
for (int i = 0; i < this.children.size(); i++) { |
|
2511 | 2508 |
|
2512 |
Log.finest("TXMResult.compute(): " + this.getClass().getSimpleName() + ": cascade computing of " + this.children.size() + " child(ren)."); |
|
2509 |
TXMResult child = this.children.get(i); |
|
2510 |
child.setDirty(); // set the children as dirty since the result has changed |
|
2513 | 2511 |
|
2514 |
for (int i = 0; i < this.children.size(); i++) { |
|
2515 |
|
|
2516 |
TXMResult child = this.children.get(i); |
|
2517 |
// lazy loading test |
|
2518 |
// only compute the child if it has already been computed one time ("loaded" one time) |
|
2519 |
// or if this result always needs its children synchronized/computed to be consistent (e.g. Partition and children parts) |
|
2520 |
if (!child.isComputing() && ((deepComputing && child.hasBeenComputedOnce()) || child.mustBeSynchronizedWithParent())) { |
|
2521 |
child.compute(loopMonitor.split(1).setWorkRemaining(100), deepComputing); |
|
2522 |
} |
|
2523 |
else { |
|
2524 |
loopMonitor.worked(1); |
|
2525 |
} |
|
2512 |
// lazy loading test |
|
2513 |
// only compute the child if it has already been computed one time ("loaded" one time) |
|
2514 |
// or if this result always needs its children synchronized/computed to be consistent (e.g. Partition and children parts) |
|
2515 |
if (!child.isComputing() && ((deepComputing && child.hasBeenComputedOnce()) || child.mustBeSynchronizedWithParent())) { |
|
2516 |
child.compute(loopMonitor.split(1).setWorkRemaining(100), deepComputing); |
|
2526 | 2517 |
} |
2518 |
else { |
|
2519 |
loopMonitor.worked(1); |
|
2520 |
} |
|
2527 | 2521 |
} |
2528 | 2522 |
} |
2529 | 2523 |
} |
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 2729) | ||
---|---|---|
368 | 368 |
} |
369 | 369 |
|
370 | 370 |
|
371 |
@Override |
|
372 |
public void setFocus() {
|
|
373 |
|
|
374 |
// FIXME: SJ: old code, temporary disabled
|
|
375 |
// Debug
|
|
376 |
Log.finest("ChartEditor.setFocus(): giving focus to chart composite..."); //$NON-NLS-1$
|
|
377 |
|
|
378 |
this.parent.setFocus();
|
|
379 |
// super.setFocus();
|
|
380 |
//
|
|
381 |
// this.chartComposite.setFocus();
|
|
382 |
//
|
|
383 |
//
|
|
384 |
|
|
385 |
// SJ: new code
|
|
386 |
// super.setFocus();
|
|
387 |
|
|
388 |
} |
|
371 |
// @Override
|
|
372 |
// public void _setFocus() {
|
|
373 |
// |
|
374 |
// // FIXME: SJ: old code, temporary disabled
|
|
375 |
// // Debug
|
|
376 |
// Log.finest("ChartEditor.setFocus(): giving focus to chart composite..."); //$NON-NLS-1$
|
|
377 |
// |
|
378 |
// this.parent.setFocus();
|
|
379 |
// // super.setFocus();
|
|
380 |
// //
|
|
381 |
// // this.chartComposite.setFocus();
|
|
382 |
// //
|
|
383 |
// //
|
|
384 |
// |
|
385 |
// // SJ: new code
|
|
386 |
// // super.setFocus();
|
|
387 |
// |
|
388 |
// }
|
|
389 | 389 |
|
390 | 390 |
|
391 | 391 |
|
tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java (revision 2729) | ||
---|---|---|
70 | 70 |
* The Class ReferencerEditor display&update a Referencer TXMResult |
71 | 71 |
*/ |
72 | 72 |
public class ReferencerEditor extends TXMEditor<Referencer> { |
73 |
|
|
73 |
|
|
74 | 74 |
/** The Constant ID. */ |
75 | 75 |
public static final String ID = ReferencerEditor.class.getName(); |
76 | 76 |
|
... | ... | |
79 | 79 |
|
80 | 80 |
/** The referencer. */ |
81 | 81 |
Referencer referencer; |
82 |
|
|
83 | 82 |
|
83 |
|
|
84 | 84 |
/** The navigation area. */ |
85 | 85 |
NavigationWidget navigationArea; |
86 |
|
|
86 |
|
|
87 | 87 |
/** The line table viewer. */ |
88 | 88 |
protected TableViewer viewer; |
89 | 89 |
|
... | ... | |
98 | 98 |
|
99 | 99 |
/** The separator column. */ |
100 | 100 |
protected TableColumn separatorColumn; |
101 |
|
|
101 |
|
|
102 | 102 |
/** The lineperpage. */ |
103 | 103 |
int lineperpage = 100; |
104 | 104 |
|
105 | 105 |
/** The top line. */ |
106 |
int topLine=0;
|
|
106 |
int topLine = 0;
|
|
107 | 107 |
|
108 | 108 |
/** The bottom line. */ |
109 | 109 |
int bottomLine; |
110 |
|
|
111 | 110 |
|
112 | 111 |
|
112 |
|
|
113 | 113 |
/** The mess. */ |
114 | 114 |
String mess; |
115 |
|
|
116 |
|
|
117 | 115 |
|
116 |
|
|
117 |
|
|
118 | 118 |
/** The querywidget. */ |
119 |
@Parameter(key=ReferencerPreferences.QUERY)
|
|
119 |
@Parameter(key = ReferencerPreferences.QUERY)
|
|
120 | 120 |
protected QueryWidget querywidget; |
121 | 121 |
|
122 | 122 |
/** |
123 | 123 |
* Word property selector. |
124 | 124 |
*/ |
125 |
@Parameter(key=ReferencerPreferences.UNIT_PROPERTY)
|
|
125 |
@Parameter(key = ReferencerPreferences.UNIT_PROPERTY)
|
|
126 | 126 |
protected PropertiesSelector<Property> propertiesSelector; |
127 | 127 |
|
128 | 128 |
/** The pattern area. */ |
129 |
@Parameter(key=ReferencerPreferences.PATTERN)
|
|
129 |
@Parameter(key = ReferencerPreferences.PATTERN)
|
|
130 | 130 |
protected PropertiesSelector<StructuralUnitProperty> patternArea; |
131 |
|
|
132 | 131 |
|
133 |
|
|
134 | 132 |
|
133 |
|
|
134 |
|
|
135 | 135 |
@Override |
136 | 136 |
public void _createPartControl() { |
137 | 137 |
|
138 |
this.referencer = ((Referencer) this.getResult());
|
|
138 |
this.referencer = (this.getResult()); |
|
139 | 139 |
this.corpus = referencer.getCorpus(); |
140 |
|
|
140 |
|
|
141 | 141 |
// Computing listener |
142 | 142 |
ComputeSelectionListener computeSelectionListener = new ComputeSelectionListener(this); |
143 | 143 |
ComputeKeyListener computeKeyListener = new ComputeKeyListener(this); |
... | ... | |
155 | 155 |
querywidget = new QueryWidget(getMainParametersComposite(), SWT.None); |
156 | 156 |
querywidget.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); |
157 | 157 |
querywidget.addKeyListener(computeKeyListener); |
158 |
|
|
158 |
|
|
159 | 159 |
// [Edit] |
160 |
propertiesSelector = new PropertiesSelector<Property>(getMainParametersComposite(), SWT.NONE);
|
|
160 |
propertiesSelector = new PropertiesSelector<>(getMainParametersComposite(), SWT.NONE); |
|
161 | 161 |
propertiesSelector.setMaxPropertyNumber(1); |
162 | 162 |
propertiesSelector.setLayoutData(new GridData(GridData.FILL, GridData.FILL, |
163 | 163 |
false, false)); |
... | ... | |
165 | 165 |
propertiesSelector.addSelectionListener(computeSelectionListener); |
166 | 166 |
|
167 | 167 |
// [Search] |
168 |
// Button go = new Button(paramArea, SWT.PUSH);
|
|
169 |
// go.setText(TXMUIMessages.SEARCH);
|
|
170 |
// go.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
|
|
171 |
// false, false));
|
|
172 |
// Font f = go.getFont();
|
|
173 |
// FontData defaultFont = f.getFontData()[0];
|
|
174 |
// defaultFont.setStyle(SWT.BOLD);
|
|
175 |
// Font newf = new Font(go.getDisplay(), defaultFont);
|
|
176 |
// go.setFont(newf);
|
|
177 |
// |
|
178 |
// go.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
|
|
179 |
// go.addSelectionListener(computeSelectionListener);
|
|
180 |
|
|
168 |
// Button go = new Button(paramArea, SWT.PUSH);
|
|
169 |
// go.setText(TXMUIMessages.SEARCH);
|
|
170 |
// go.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
|
|
171 |
// false, false));
|
|
172 |
// Font f = go.getFont();
|
|
173 |
// FontData defaultFont = f.getFontData()[0];
|
|
174 |
// defaultFont.setStyle(SWT.BOLD);
|
|
175 |
// Font newf = new Font(go.getDisplay(), defaultFont);
|
|
176 |
// go.setFont(newf);
|
|
177 |
//
|
|
178 |
// go.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
|
|
179 |
// go.addSelectionListener(computeSelectionListener);
|
|
180 |
|
|
181 | 181 |
// [pattern : ... ] |
182 |
patternArea = new PropertiesSelector<StructuralUnitProperty>(paramArea, SWT.NONE);
|
|
183 |
patternArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false,3,1));
|
|
182 |
patternArea = new PropertiesSelector<>(paramArea, SWT.NONE); |
|
183 |
patternArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false, 3, 1));
|
|
184 | 184 |
patternArea.setLayout(new GridLayout(3, false)); |
185 | 185 |
patternArea.setTitle(ReferencerUIMessages.referencePattern); |
186 | 186 |
patternArea.addSelectionListener(computeSelectionListener); |
187 | 187 |
|
188 | 188 |
|
189 |
//pagination |
|
189 |
// pagination
|
|
190 | 190 |
GLComposite navigationComposite = getBottomToolbar().installGLComposite("navigation", 1, false); |
191 |
navigationComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
|
|
191 |
navigationComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
|
|
192 | 192 |
|
193 | 193 |
navigationArea = new NavigationWidget(navigationComposite, SWT.BORDER); |
194 |
navigationArea.setLayoutData(new GridData(GridData.CENTER, GridData.FILL, true, false));
|
|
195 |
|
|
194 |
navigationArea.setLayoutData(new GridData(GridData.CENTER, GridData.FILL, true, false));
|
|
195 |
|
|
196 | 196 |
navigationArea.addFirstListener(new SelectionListener() { |
197 |
|
|
197 | 198 |
@Override |
198 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
199 |
} |
|
200 |
|
|
199 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
200 |
|
|
201 | 201 |
@Override |
202 | 202 |
public void widgetSelected(SelectionEvent e) { |
203 | 203 |
StatusLine.setMessage(ReferencerUIMessages.showingFirstResultPage); |
... | ... | |
208 | 208 |
} |
209 | 209 |
}); |
210 | 210 |
navigationArea.addLastListener(new SelectionListener() { |
211 |
|
|
211 | 212 |
@Override |
212 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
213 |
} |
|
214 |
|
|
213 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
214 |
|
|
215 | 215 |
@Override |
216 | 216 |
public void widgetSelected(SelectionEvent e) { |
217 | 217 |
StatusLine.setMessage(ReferencerUIMessages.showingLastResultPage); |
... | ... | |
223 | 223 |
} |
224 | 224 |
}); |
225 | 225 |
navigationArea.addNextListener(new SelectionListener() { |
226 |
|
|
226 | 227 |
@Override |
227 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
228 |
} |
|
229 |
|
|
228 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
229 |
|
|
230 | 230 |
@Override |
231 | 231 |
public void widgetSelected(SelectionEvent e) { |
232 | 232 |
StatusLine.setMessage(ReferencerUIMessages.showingNextResultPage); |
... | ... | |
238 | 238 |
} |
239 | 239 |
}); |
240 | 240 |
navigationArea.addPreviousListener(new SelectionListener() { |
241 |
|
|
241 | 242 |
@Override |
242 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
243 |
} |
|
244 |
|
|
243 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
244 |
|
|
245 | 245 |
@Override |
246 | 246 |
public void widgetSelected(SelectionEvent e) { |
247 | 247 |
StatusLine.setMessage(ReferencerUIMessages.showingPreviousResultPage); |
... | ... | |
253 | 253 |
} |
254 | 254 |
}); |
255 | 255 |
|
256 |
//result |
|
257 |
|
|
256 |
// result
|
|
257 |
|
|
258 | 258 |
Composite resultArea = getResultArea(); |
259 | 259 |
|
260 | 260 |
viewer = new TableViewer(resultArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER); |
... | ... | |
262 | 262 |
if (corpus != null && corpus.getFont() != null && corpus.getFont().length() > 0) { |
263 | 263 |
Font old = viewer.getTable().getFont(); |
264 | 264 |
FontData fD = old.getFontData()[0]; |
265 |
//Font f = new Font(old.getDevice(), corpus.getFont(), fD.getHeight(), fD.getStyle()); |
|
266 |
Font font = new Font(Display.getCurrent(), corpus.getFont(), fD.getHeight(), fD.getStyle());
|
|
265 |
// Font f = new Font(old.getDevice(), corpus.getFont(), fD.getHeight(), fD.getStyle());
|
|
266 |
Font font = new Font(Display.getCurrent(), corpus.getFont(), fD.getHeight(), fD.getStyle()); |
|
267 | 267 |
viewer.getTable().setFont(font); |
268 | 268 |
} |
269 | 269 |
|
270 | 270 |
viewer.getTable().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true)); |
271 | 271 |
viewer.getTable().setLinesVisible(true); |
272 | 272 |
viewer.getTable().setHeaderVisible(true); |
273 |
|
|
273 |
|
|
274 | 274 |
viewer.setLabelProvider(new LineLabelProvider()); |
275 | 275 |
viewer.setContentProvider(new LineContentProvider()); |
276 | 276 |
viewer.setInput(new ArrayList<Property>()); |
277 |
|
|
278 |
// viewer.getTable().addMouseListener(new MouseAdapter() {
|
|
279 |
// @Override
|
|
280 |
// public void mouseDoubleClick(MouseEvent e) {
|
|
281 |
//
|
|
282 |
// Point mouseposition = new Point(e.x
|
|
283 |
// + viewer.getTable().getHorizontalBar()
|
|
284 |
// .getSelection(), e.y);
|
|
285 |
// int col = getPointedColumn(mouseposition);
|
|
286 |
// if (col == 1) {
|
|
287 |
// StatusLine.setMessage(ReferencerUIMessages.ReferencerEditor_25);
|
|
288 |
// sendSelectionToConc();
|
|
289 |
// } else if (col == 2) {
|
|
290 |
// //System.out.println("Send to edition ?"); //$NON-NLS-1$
|
|
291 |
// }
|
|
292 |
// }
|
|
293 |
// });
|
|
294 |
|
|
277 |
|
|
278 |
// viewer.getTable().addMouseListener(new MouseAdapter() {
|
|
279 |
// @Override
|
|
280 |
// public void mouseDoubleClick(MouseEvent e) {
|
|
281 |
//
|
|
282 |
// Point mouseposition = new Point(e.x
|
|
283 |
// + viewer.getTable().getHorizontalBar()
|
|
284 |
// .getSelection(), e.y);
|
|
285 |
// int col = getPointedColumn(mouseposition);
|
|
286 |
// if (col == 1) {
|
|
287 |
// StatusLine.setMessage(ReferencerUIMessages.ReferencerEditor_25);
|
|
288 |
// sendSelectionToConc();
|
|
289 |
// } else if (col == 2) {
|
|
290 |
// //System.out.println("Send to edition ?"); //$NON-NLS-1$
|
|
291 |
// }
|
|
292 |
// }
|
|
293 |
// });
|
|
294 |
|
|
295 | 295 |
nColumn = new TableColumn(viewer.getTable(), SWT.LEFT); |
296 | 296 |
nColumn.setText(" "); //$NON-NLS-1$ |
297 | 297 |
nColumn.pack(); |
298 |
|
|
298 |
|
|
299 | 299 |
unitColumn = new TableColumn(viewer.getTable(), SWT.LEFT); |
300 | 300 |
unitColumn.setText(TXMCoreMessages.common_units); |
301 | 301 |
unitColumn.setToolTipText(TXMCoreMessages.common_units); |
302 | 302 |
unitColumn.setWidth(200); |
303 |
|
|
303 |
|
|
304 | 304 |
freqColumn = new TableColumn(viewer.getTable(), SWT.LEFT); |
305 | 305 |
freqColumn.setText(ReferencerUIMessages.references); |
306 | 306 |
freqColumn.setToolTipText(ReferencerUIMessages.references); |
... | ... | |
314 | 314 |
|
315 | 315 |
// Register the context menu |
316 | 316 |
TXMEditor.initContextMenu(this.viewer.getTable(), this.getSite(), this.viewer); |
317 |
|
|
318 | 317 |
|
318 |
|
|
319 | 319 |
} |
320 | 320 |
|
321 | 321 |
@Override |
322 | 322 |
public void updateEditorFromResult(boolean update) { |
323 |
|
|
323 |
|
|
324 | 324 |
fillDisplayArea(0, lineperpage); |
325 | 325 |
|
326 | 326 |
viewer.getTable().setFocus(); |
327 | 327 |
} |
328 |
|
|
329 |
|
|
330 |
|
|
328 |
|
|
329 |
|
|
330 |
|
|
331 | 331 |
/** |
332 | 332 |
* Fill display area. |
333 | 333 |
* |
... | ... | |
341 | 341 |
if (referencer.getNLines() > 0) { |
342 | 342 |
try { |
343 | 343 |
lines = referencer.getLines(from, to); |
344 |
} catch (Exception e) { |
|
344 |
} |
|
345 |
catch (Exception e) { |
|
345 | 346 |
org.txm.utils.logger.Log.printStackTrace(e); |
346 |
lines = new ArrayList<Line>();
|
|
347 |
lines = new ArrayList<>(); |
|
347 | 348 |
} |
348 |
} else { |
|
349 |
lines = new ArrayList<Line>(); |
|
350 | 349 |
} |
350 |
else { |
|
351 |
lines = new ArrayList<>(); |
|
352 |
} |
|
351 | 353 |
|
352 |
navigationArea.setInfoLineText(""+(from + 1), //$NON-NLS-1$
|
|
354 |
navigationArea.setInfoLineText("" + (from + 1), //$NON-NLS-1$
|
|
353 | 355 |
"-" + (to) + " / " + referencer.getNLines()); //$NON-NLS-1$ //$NON-NLS-2$ |
354 | 356 |
navigationArea.setPreviousEnabled(from > 0); |
355 | 357 |
navigationArea.setFirstEnabled(from > 0); |
356 | 358 |
navigationArea.setNextEnabled(to < referencer.getNLines() - 1); |
357 | 359 |
navigationArea.setLastEnabled(to < referencer.getNLines() - 1); |
358 |
|
|
360 |
|
|
359 | 361 |
unitColumn.setText(referencer.getProperty().getName()); |
360 |
|
|
362 |
|
|
361 | 363 |
String unitColumnHeader = ""; //$NON-NLS-1$ |
362 | 364 |
for (Property p : referencer.getPattern()) |
363 | 365 |
unitColumnHeader += p.getName() + ", "; //$NON-NLS-1$ |
... | ... | |
365 | 367 |
unitColumnHeader = unitColumnHeader.substring(0, unitColumnHeader |
366 | 368 |
.length() - 2); |
367 | 369 |
freqColumn.setText(unitColumnHeader); |
368 |
|
|
370 |
|
|
369 | 371 |
viewer.setInput(lines); |
370 | 372 |
viewer.refresh(); |
371 | 373 |
// System.out.println("table refreshed from "+from+" to "+to+" with : "+lines); |
... | ... | |
375 | 377 |
col.pack(); |
376 | 378 |
} |
377 | 379 |
} |
378 |
|
|
380 |
|
|
379 | 381 |
/** |
380 | 382 |
* Gets the pointed column. |
381 | 383 |
* |
... | ... | |
387 | 389 |
int sumWidthColumn = this.nColumn.getWidth(); |
388 | 390 |
if (x < sumWidthColumn) |
389 | 391 |
return 0; |
390 |
|
|
392 |
|
|
391 | 393 |
sumWidthColumn += this.unitColumn.getWidth(); |
392 | 394 |
if (x < sumWidthColumn) |
393 | 395 |
return 1; |
394 |
|
|
396 |
|
|
395 | 397 |
sumWidthColumn += this.freqColumn.getWidth(); |
396 | 398 |
if (x < sumWidthColumn) |
397 | 399 |
return 2; |
398 |
|
|
400 |
|
|
399 | 401 |
return 2; |
400 | 402 |
} |
401 |
|
|
402 |
/* (non-Javadoc) |
|
403 |
* @see org.eclipse.ui.part.WorkbenchPart#setFocus() |
|
404 |
*/ |
|
405 |
@Override |
|
406 |
public void setFocus() { |
|
407 |
super.setFocus(); |
|
408 |
//querywidget.setFocus(); |
|
409 |
} |
|
410 |
|
|
403 |
|
|
411 | 404 |
/** |
412 | 405 |
* Gets the referencer. |
413 | 406 |
* |
... | ... | |
416 | 409 |
public Referencer getReferencer() { |
417 | 410 |
return this.referencer; |
418 | 411 |
} |
419 |
|
|
412 |
|
|
420 | 413 |
/** |
421 | 414 |
* Gets the corpus. |
422 | 415 |
* |
... | ... | |
425 | 418 |
public CQPCorpus getCorpus() { |
426 | 419 |
return this.corpus; |
427 | 420 |
} |
428 |
|
|
421 |
|
|
429 | 422 |
/** |
430 | 423 |
* |
431 | 424 |
*/ |
432 | 425 |
protected void initializeFields() { |
433 | 426 |
// word properties |
434 | 427 |
try { |
435 |
ArrayList<Property> selectedProps = new ArrayList<Property>();
|
|
436 |
ArrayList<Property> availables = new ArrayList<Property>();
|
|
428 |
ArrayList<Property> selectedProps = new ArrayList<>(); |
|
429 |
ArrayList<Property> availables = new ArrayList<>(); |
|
437 | 430 |
availables.addAll(corpus.getOrderedProperties()); |
438 | 431 |
|
439 | 432 |
if (referencer.getProperty() != null) { |
440 | 433 |
selectedProps.add(referencer.getProperty()); |
441 | 434 |
availables.remove(referencer.getProperty()); |
442 | 435 |
this.propertiesSelector.setProperties(availables, selectedProps); |
443 |
} else { |
|
436 |
} |
|
437 |
else { |
|
444 | 438 |
this.propertiesSelector.setCorpus(corpus); |
445 | 439 |
} |
446 | 440 |
|
447 |
} catch (CqiClientException e1) { |
|
441 |
} |
|
442 |
catch (CqiClientException e1) { |
|
448 | 443 |
org.txm.utils.logger.Log.printStackTrace(e1); |
449 | 444 |
} |
450 | 445 |
|
451 | 446 |
// references |
452 | 447 |
|
453 | 448 |
try { |
454 |
ArrayList<StructuralUnitProperty> availables2 = new ArrayList<StructuralUnitProperty>();
|
|
449 |
ArrayList<StructuralUnitProperty> availables2 = new ArrayList<>(); |
|
455 | 450 |
availables2.addAll(corpus.getStructuralUnitProperties()); |
456 | 451 |
Collections.sort(availables2); |
457 | 452 |
|
458 |
ArrayList<StructuralUnitProperty> selectedProps = new ArrayList<StructuralUnitProperty>();
|
|
453 |
ArrayList<StructuralUnitProperty> selectedProps = new ArrayList<>(); |
|
459 | 454 |
if (referencer.getPattern() != null) { |
460 |
for(StructuralUnitProperty p : referencer.getPattern()) { |
|
455 |
for (StructuralUnitProperty p : referencer.getPattern()) {
|
|
461 | 456 |
selectedProps.add(p); |
462 | 457 |
availables2.remove(p); |
463 | 458 |
} |
464 | 459 |
} |
465 | 460 |
|
466 | 461 |
this.patternArea.setProperties(availables2, selectedProps); |
467 |
} catch (CqiClientException e1) { |
|
462 |
} |
|
463 |
catch (CqiClientException e1) { |
|
468 | 464 |
org.txm.utils.logger.Log.printStackTrace(e1); |
469 | 465 |
return; |
470 | 466 |
} |
471 | 467 |
} |
472 |
|
|
468 |
|
|
473 | 469 |
@Override |
474 | 470 |
public void updateResultFromEditor() { |
475 | 471 |
// nothing to do |
476 | 472 |
} |
477 |
} |
|
473 |
} |
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java (revision 2729) | ||
---|---|---|
358 | 358 |
|
359 | 359 |
|
360 | 360 |
@Override |
361 |
public void setFocus() { |
|
361 |
public void _setFocus() {
|
|
362 | 362 |
this.specificitesTable.setFocus(); |
363 | 363 |
} |
364 | 364 |
|
tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java (revision 2729) | ||
---|---|---|
872 | 872 |
} |
873 | 873 |
|
874 | 874 |
@Override |
875 |
public void setFocus() { |
|
876 |
|
|
875 |
public void _setFocus() {
|
|
876 |
this.getEditionPanel(0).setFocus(); |
|
877 | 877 |
} |
878 | 878 |
|
879 | 879 |
public void backToText(Text text, String line_wordid) { |
tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java (revision 2729) | ||
---|---|---|
100 | 100 |
* @author mdecorde |
101 | 101 |
*/ |
102 | 102 |
public class QueryIndexEditor extends TXMEditor<QueryIndex> { |
103 |
|
|
103 |
|
|
104 | 104 |
/** The Constant ID. */ |
105 | 105 |
public static final String ID = "org.txm.rcp.editors.queryindex.QueryIndexEditor"; //$NON-NLS-1$ |
106 |
|
|
106 |
|
|
107 | 107 |
/** The corpus. */ |
108 | 108 |
protected CQPCorpus corpus; |
109 |
|
|
109 | 110 |
protected Partition partition; // can be null |
110 |
|
|
111 |
|
|
111 | 112 |
/** The index. */ |
112 | 113 |
protected QueryIndex queryindex; |
114 |
|
|
113 | 115 |
boolean stored = false; // start storing at first line added |
114 | 116 |
// protected boolean saveQueryIndex = true; |
115 |
|
|
117 |
|
|
116 | 118 |
// params |
117 | 119 |
/** The query label. */ |
118 | 120 |
protected Label queryLabel; |
119 |
|
|
121 |
|
|
120 | 122 |
/** The query widget. */ |
121 | 123 |
protected NamedAssistedQueryWidget queryWidget; |
122 |
|
|
124 |
|
|
123 | 125 |
/** The N ligne p page spinner. */ |
124 | 126 |
protected Spinner NLignePPageSpinner; |
127 |
|
|
125 | 128 |
// infos |
126 | 129 |
/** The navigation area. */ |
127 | 130 |
protected NavigationWidget navigationArea; |
128 |
|
|
131 |
|
|
129 | 132 |
/** The l fmin info. */ |
130 | 133 |
protected Label lFminInfo; |
131 |
|
|
134 |
|
|
132 | 135 |
/** The l fmax info. */ |
133 | 136 |
protected Label lFmaxInfo; |
134 |
|
|
137 |
|
|
135 | 138 |
/** The l v info. */ |
136 | 139 |
protected Label lVInfo; |
137 |
|
|
140 |
|
|
138 | 141 |
/** The l t info. */ |
139 | 142 |
protected Label lTInfo; |
143 |
|
|
140 | 144 |
// result |
141 | 145 |
/** The line table viewer. */ |
142 | 146 |
protected TableViewer viewer; |
143 |
|
|
147 |
|
|
144 | 148 |
/** The n column. */ |
145 | 149 |
protected TableColumn nColumn; |
146 |
|
|
150 |
|
|
147 | 151 |
/** The unit column. */ |
148 | 152 |
protected TableColumn unitColumn; |
149 |
|
|
153 |
|
|
150 | 154 |
/** The freq column. */ |
151 | 155 |
protected TableColumn freqColumn; |
152 |
|
|
156 |
|
|
153 | 157 |
/** The separator column. */ |
154 | 158 |
protected TableColumn separatorColumn; |
155 |
|
|
159 |
|
|
156 | 160 |
/** The top line. */ |
157 | 161 |
protected int topLine; |
158 |
|
|
162 |
|
|
159 | 163 |
/** The bottom line. */ |
160 | 164 |
protected int bottomLine; |
161 |
|
|
165 |
|
|
162 | 166 |
/** The nblinesperpage. */ |
163 | 167 |
protected int nblinesperpage; |
164 |
|
|
168 |
|
|
165 | 169 |
/** The nblinesmax. */ |
166 | 170 |
protected int nblinesmax; |
167 |
|
|
168 |
// /** The scroll composite. */
|
|
169 |
// private ScrolledComposite scrollComposite;
|
|
170 |
// |
|
171 |
// /** The head composite. */
|
|
172 |
// private Composite headComposite;
|
|
173 |
|
|
171 |
|
|
172 |
// /** The scroll composite. */
|
|
173 |
// private ScrolledComposite scrollComposite;
|
|
174 |
//
|
|
175 |
// /** The head composite. */
|
|
176 |
// private Composite headComposite;
|
|
177 |
|
|
174 | 178 |
/** The title. */ |
175 | 179 |
String title; |
176 |
|
|
180 |
|
|
177 | 181 |
/** |
178 | 182 |
* Instantiates a new index editor. |
179 | 183 |
*/ |
180 | 184 |
public QueryIndexEditor() { |
181 | 185 |
super(); |
182 | 186 |
} |
183 |
|
|
187 |
|
|
184 | 188 |
/** |
185 | 189 |
* Do save. |
186 | 190 |
* |
... | ... | |
192 | 196 |
public void doSave(IProgressMonitor arg0) { |
193 | 197 |
// TODO Auto-generated method stub |
194 | 198 |
} |
195 |
|
|
199 |
|
|
196 | 200 |
/** |
197 | 201 |
* Do save as. |
198 | 202 |
* |
... | ... | |
202 | 206 |
public void doSaveAs() { |
203 | 207 |
// TODO Auto-generated method stub |
204 | 208 |
} |
205 |
|
|
209 |
|
|
206 | 210 |
/** |
207 | 211 |
* Inits the. |
208 | 212 |
* |
... | ... | |
220 | 224 |
throws PartInitException { |
221 | 225 |
setSite(site); |
222 | 226 |
setInput(input); |
223 |
|
|
224 |
TXMResultEditorInput<QueryIndex> tre = (TXMResultEditorInput)input; |
|
227 |
|
|
228 |
TXMResultEditorInput<QueryIndex> tre = (TXMResultEditorInput) input;
|
|
225 | 229 |
this.corpus = tre.getResult().getCorpus(); |
226 | 230 |
this.partition = tre.getResult().getPartition(); |
227 | 231 |
this.queryindex = tre.getResult(); |
228 | 232 |
} |
229 |
|
|
233 |
|
|
230 | 234 |
/** |
231 | 235 |
* Checks if is dirty. |
232 | 236 |
* |
... | ... | |
237 | 241 |
public boolean isDirty() { |
238 | 242 |
return false; |
239 | 243 |
} |
240 |
|
|
244 |
|
|
241 | 245 |
/** |
242 | 246 |
* Checks if is save as allowed. |
243 | 247 |
* |
... | ... | |
248 | 252 |
public boolean isSaveAsAllowed() { |
249 | 253 |
return false; |
250 | 254 |
} |
251 |
|
|
255 |
|
|
252 | 256 |
private QueryIndex createQueryIndex() { |
253 | 257 |
if (queryindex == null) { |
254 | 258 |
if (partition != null) { |
255 | 259 |
queryindex = new QueryIndex(partition); |
256 | 260 |
title = NLS.bind(Messages.QueryIndexEditor_0, partition.getName()); |
257 |
} else { |
|
261 |
} |
|
262 |
else { |
|
258 | 263 |
queryindex = new QueryIndex(corpus); |
259 | 264 |
title = NLS.bind(Messages.QueryIndexEditor_0, corpus); |
260 | 265 |
} |
261 | 266 |
} |
262 | 267 |
return queryindex; |
263 | 268 |
} |
264 |
|
|
269 |
|
|
265 | 270 |
@Override |
266 | 271 |
public void updateResultFromEditor() { |
267 | 272 |
System.out.println("QueryIndexEditor.updateResultFromEditor(): not implemented."); |
... | ... | |
275 | 280 |
System.out.println("QueryIndexEditor.updateEditorFromResult(): not implemented."); |
276 | 281 |
if (1 == 1) return; |
277 | 282 |
|
278 |
//createQueryIndex(); |
|
279 |
|
|
283 |
// createQueryIndex();
|
|
284 |
|
|
280 | 285 |
StatusLine.setMessage(IndexUIMessages.computingIndex); |
281 | 286 |
|
282 | 287 |
final CQLQuery query; // if the query is empty then we put "[]" instead |
283 | 288 |
if (!queryWidget.getQueryString().equals("\"\"")) {//$NON-NLS-1$ |
284 | 289 |
query = new CQLQuery(queryWidget.getQueryString()); |
285 |
} else { |
|
290 |
} |
|
291 |
else { |
|
286 | 292 |
Log.severe(IndexUIMessages.indexColonQueryIsEmpty); |
287 | 293 |
return; |
288 | 294 |
} |
289 |
|
|
295 |
|
|
290 | 296 |
final String name; |
291 | 297 |
if (queryWidget.getQueryName().length() == 0) { |
292 | 298 |
name = query.toString(); |
293 |
} else { |
|
299 |
} |
|
300 |
else { |
|
294 | 301 |
name = queryWidget.getQueryName(); |
295 | 302 |
} |
296 |
|
|
303 |
|
|
297 | 304 |
title = "Computing QueryIndex..."; |
298 | 305 |
|
299 | 306 |
try { |
300 | 307 |
JobHandler jobhandler = new JobHandler(title, |
301 | 308 |
queryWidget.getParent()) { |
309 |
|
|
302 | 310 |
@Override |
303 | 311 |
protected IStatus run(IProgressMonitor monitor) { |
304 | 312 |
this.runInit(monitor); |
... | ... | |
311 | 319 |
queryindex.removeLine(name); |
312 | 320 |
} |
313 | 321 |
line = queryindex.addLine(name, query); |
314 |
} catch (CqiClientException e2) { |
|
315 |
Log.severe(TXMCoreMessages.bind(Messages.error_QueryIndexEditor_2 , query)); |
|
322 |
} |
|
323 |
catch (CqiClientException e2) { |
|
324 |
Log.severe(TXMCoreMessages.bind(Messages.error_QueryIndexEditor_2, query)); |
|
316 | 325 |
Log.printStackTrace(e2); |
317 | 326 |
return Status.CANCEL_STATUS; |
318 | 327 |
} |
319 |
|
|
328 |
|
|
320 | 329 |
if (line == null) { |
321 | 330 |
Log.severe(TXMCoreMessages.bind(Messages.error_QueryIndexEditor_2, query)); |
322 | 331 |
return Status.CANCEL_STATUS; |
323 | 332 |
} |
324 |
|
|
333 |
|
|
325 | 334 |
if (monitor.isCanceled()) |
326 | 335 |
return Status.CANCEL_STATUS; |
327 |
|
|
336 |
|
|
328 | 337 |
queryindex.sortLines(SortMode.FREQUNIT, true); |
329 |
|
|
338 |
|
|
330 | 339 |
if (monitor.isCanceled()) |
331 | 340 |
return Status.CANCEL_STATUS; |
332 |
|
|
341 |
|
|
333 | 342 |
this.acquireSemaphore(); |
334 | 343 |
this.releaseSemaphore(); |
335 |
|
|
344 |
|
|
336 | 345 |
final String message = Messages.QueryIndexEditor_3; |
337 |
|
|
346 |
|
|
338 | 347 |
if (monitor.isCanceled()) |
339 | 348 |
return Status.CANCEL_STATUS; |
340 |
|
|
349 |
|
|
341 | 350 |
monitor.worked(95); |
342 | 351 |
// refresh ui |
343 | 352 |
syncExec(new Runnable() { |
353 |
|
|
344 | 354 |
@Override |
345 | 355 |
public void run() { |
346 |
|
|
356 |
|
|
347 | 357 |
System.out.println(message); |
348 | 358 |
StatusLine.setMessage(message); |
349 |
|
|
359 |
|
|
350 | 360 |
CorporaView.refresh(); |
351 | 361 |
CorporaView.expand(queryindex.getParent()); |
352 | 362 |
QueriesView.refresh(); |
353 | 363 |
RVariablesView.refresh(); |
354 |
|
|
364 |
|
|
355 | 365 |
setPartName(title); |
356 |
|
|
366 |
|
|
357 | 367 |
queryWidget.memorize(); |
358 | 368 |
nblinesperpage = NLignePPageSpinner |
359 | 369 |
.getSelection(); |
360 |
|
|
370 |
|
|
361 | 371 |
fillDisplayArea(0, |
362 | 372 |
NLignePPageSpinner.getSelection()); |
363 |
|
|
373 |
|
|
364 | 374 |
if (line != null) { |
365 | 375 |
queryWidget.setText(""); //$NON-NLS-1$ |
366 | 376 |
queryWidget.setName(""); //$NON-NLS-1$ |
... | ... | |
368 | 378 |
} |
369 | 379 |
} |
370 | 380 |
}); |
371 |
} catch (Exception e) { |
|
381 |
} |
|
382 |
catch (Exception e) { |
|
372 | 383 |
System.out.println(e.getLocalizedMessage()); |
373 | 384 |
try { |
374 | 385 |
Log.severe(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.lastCQPErrorColon, CQPSearchEngine.getCqiClient().getLastCQPError())); |
375 |
} catch (Exception e1) { |
|
386 |
} |
|
387 |
catch (Exception e1) { |
|
376 | 388 |
Log.severe(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.cQPErrorColonP0, e1)); |
377 | 389 |
Log.printStackTrace(e1); |
378 | 390 |
} |
379 | 391 |
Log.severe(TXMCoreMessages.bind("Error while computing QueryIndex: {0}.", e.getLocalizedMessage())); |
380 |
} catch (ThreadDeath td) { |
|
392 |
} |
|
393 |
catch (ThreadDeath td) { |
|
381 | 394 |
return Status.CANCEL_STATUS; |
382 |
} finally { |
|
395 |
} |
|
396 |
finally { |
|
383 | 397 |
monitor.done(); |
384 | 398 |
JobsTimer.stopAndPrint(); |
385 | 399 |
} |
... | ... | |
387 | 401 |
} |
388 | 402 |
}; |
389 | 403 |
jobhandler.startJob(); |
390 |
|
|
391 |
} catch (Exception e1) { |
|
404 |
|
|
405 |
} |
|
406 |
catch (Exception e1) { |
|
392 | 407 |
Log.printStackTrace(e1); |
393 | 408 |
} |
394 | 409 |
} |
395 |
|
|
410 |
|
|
396 | 411 |
/** |
397 | 412 |
* Creates the part control. |
398 | 413 |
* |
... | ... | |
402 | 417 |
*/ |
403 | 418 |
@Override |
404 | 419 |
public void _createPartControl() { |
405 |
|
|
406 |
|
|
420 |
|
|
421 |
|
|
407 | 422 |
final Group paramArea = getExtendedParametersGroup(); |
408 |
|
|
409 |
|
|
423 |
|
|
424 |
|
|
410 | 425 |
GLComposite resultArea = getResultArea(); |
411 |
|
|
426 |
|
|
412 | 427 |
// on créé une Query, ici le pivot de la concordance est "[]" |
413 | 428 |
// Query Area: query itself + view properties |
414 | 429 |
Composite queryArea = new Composite(paramArea, SWT.NONE); |
415 | 430 |
RowData rdata = new RowData(); |
416 | 431 |
queryArea.setLayoutData(rdata); |
417 | 432 |
queryArea.setLayout(new GridLayout(4, false)); |
418 |
|
|
433 |
|
|
419 | 434 |
// | Query: [ (v)] [Search] | |
420 | 435 |
// Query: |
421 | 436 |
// queryLabel = new Label(queryArea, SWT.NONE); |
422 | 437 |
// queryLabel.setText(RCPMessages.IndexEditor_3); |
423 | 438 |
// queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, |
424 | 439 |
// true)); |
425 |
|
|
440 |
|
|
426 | 441 |
// [ (v)] |
427 | 442 |
queryWidget = new NamedAssistedQueryWidget(queryArea, SWT.DROP_DOWN, |
428 | 443 |
this.corpus); |
... | ... | |
433 | 448 |
layoutData.widthHint = 900; |
434 | 449 |
queryWidget.setLayoutData(layoutData); |
435 | 450 |
queryWidget.addKeyListener(new KeyListener() { |
451 |
|
|
436 | 452 |
@Override |
437 | 453 |
public void keyPressed(KeyEvent e) { |
438 | 454 |
// System.out.println("key pressed : "+e.keyCode); |
... | ... | |
440 | 456 |
compute(true); |
441 | 457 |
} |
442 | 458 |
} |
443 |
|
|
459 |
|
|
444 | 460 |
@Override |
445 |
public void keyReleased(KeyEvent e) { |
|
446 |
} |
|
461 |
public void keyReleased(KeyEvent e) {} |
|
447 | 462 |
}); |
448 |
|
|
463 |
|
|
449 | 464 |
Button loadFromFile = new Button(queryArea, SWT.BOLD); |
450 | 465 |
loadFromFile.setEnabled(true); |
451 | 466 |
loadFromFile.setText(Messages.QueryIndexEditor_4); |
452 | 467 |
loadFromFile |
453 | 468 |
.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER)); |
454 | 469 |
loadFromFile.addSelectionListener(new SelectionListener() { |
470 |
|
|
455 | 471 |
@Override |
456 | 472 |
public void widgetSelected(SelectionEvent e) { |
457 | 473 |
File propFile = null; |
458 | 474 |
if (LastOpened.getFile(ID) != null) |
459 | 475 |
propFile = new File(LastOpened.getFolder(ID)); |
460 |
|
|
476 |
|
|
461 | 477 |
FileDialog dialog = new FileDialog(getShell(), SWT.OPEN); |
462 |
String[] exts = { "*.properties" }; //$NON-NLS |
|
478 |
String[] exts = { "*.properties" }; // $NON-NLS
|
|
463 | 479 |
dialog.setFilterExtensions(exts); |
464 | 480 |
if (propFile != null) { |
465 | 481 |
dialog.setFilterPath(propFile.getParent()); |
... | ... | |
474 | 490 |
try { |
475 | 491 |
queryindex.addLinesFromFile(propFile); |
476 | 492 |
queryindex.sortLines(SortMode.FREQUNIT, true); |
477 |
|
|
493 |
|
|
478 | 494 |
stored = true; |
479 |
|
|
495 |
|
|
480 | 496 |
fillDisplayArea(0, NLignePPageSpinner.getSelection()); |
481 |
|
|
497 |
|
|
482 | 498 |
CorporaView.refresh(); |
483 | 499 |
CorporaView.expand(queryindex.getParent()); |
484 | 500 |
QueriesView.refresh(); |
485 | 501 |
RVariablesView.refresh(); |
486 |
|
|
502 |
|
|
487 | 503 |
setPartName(title); |
488 |
|
|
504 |
|
|
489 | 505 |
queryWidget.focus(); |
490 |
} catch (CqiClientException e1) { |
|
506 |
} |
|
507 |
catch (CqiClientException e1) { |
|
491 | 508 |
// TODO Auto-generated catch block |
492 | 509 |
Log.printStackTrace(e1); |
493 |
} catch (IOException e1) { |
|
510 |
} |
|
511 |
catch (IOException e1) { |
|
494 | 512 |
Log.severe(TXMCoreMessages.bind(Messages.error_QueryIndexEditor_6, propFile)); |
495 | 513 |
Log.printStackTrace(e1); |
496 | 514 |
} |
497 | 515 |
} |
498 | 516 |
} |
499 |
|
|
517 |
|
|
500 | 518 |
@Override |
501 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
502 |
} |
|
519 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
503 | 520 |
}); |
504 |
|
|
521 |
|
|
505 | 522 |
Button go = new Button(queryArea, SWT.BOLD); |
506 | 523 |
go.setText(Messages.QueryIndexEditor_12); |
507 |
|
|
524 |
|
|
508 | 525 |
Font f = go.getFont(); |
509 | 526 |
FontData defaultFont = f.getFontData()[0]; |
510 | 527 |
defaultFont.setStyle(SWT.BOLD); |
511 | 528 |
Font newf = new Font(go.getDisplay(), defaultFont); |
512 | 529 |
go.setFont(newf); |
513 |
|
|
530 |
|
|
514 | 531 |
layoutData = new GridData(GridData.VERTICAL_ALIGN_CENTER); |
515 | 532 |
layoutData.horizontalAlignment = GridData.FILL; |
516 | 533 |
layoutData.grabExcessHorizontalSpace = false; |
517 | 534 |
go.setLayoutData(layoutData); |
518 |
|
|
535 |
|
|
519 | 536 |
go.addSelectionListener(new SelectionListener() { |
537 |
|
|
520 | 538 |
@Override |
521 | 539 |
public void widgetSelected(SelectionEvent e) { |
522 | 540 |
compute(true); |
523 | 541 |
} |
524 |
|
|
542 |
|
|
525 | 543 |
@Override |
526 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
527 |
} |
|
544 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
528 | 545 |
}); |
529 |
|
|
546 |
|
|
530 | 547 |
// Filters |
531 | 548 |
Composite filtercontrols = new Composite(paramArea, SWT.NONE); |
532 |
|
|
549 |
|
|
533 | 550 |
GridLayout gridLayout = new GridLayout(); |
534 | 551 |
gridLayout.numColumns = 9; |
535 | 552 |
gridLayout.makeColumnsEqualWidth = false; |
536 | 553 |
filtercontrols.setLayout(gridLayout); |
537 |
|
|
554 |
|
|
538 | 555 |
Label lNLigneppage = new Label(filtercontrols, SWT.NONE); |
539 | 556 |
lNLigneppage.setText(IndexUIMessages.pageSize); |
540 | 557 |
lNLigneppage.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, |
541 | 558 |
false)); |
542 |
|
|
559 |
|
|
543 | 560 |
NLignePPageSpinner = new Spinner(filtercontrols, SWT.BORDER); |
544 | 561 |
NLignePPageSpinner.setMinimum(0); |
545 | 562 |
NLignePPageSpinner.setMaximum(99999); |
... | ... | |
549 | 566 |
NLignePPageSpinner.setLayoutData(new GridData( |
550 | 567 |
GridData.VERTICAL_ALIGN_END)); |
551 | 568 |
NLignePPageSpinner.addSelectionListener(new SelectionListener() { |
569 |
|
|
552 | 570 |
@Override |
553 |
public void widgetSelected(SelectionEvent e) { |
|
554 |
} |
|
555 |
|
|
571 |
public void widgetSelected(SelectionEvent e) {} |
|
572 |
|
|
556 | 573 |
@Override |
557 | 574 |
public void widgetDefaultSelected(SelectionEvent e) { |
558 | 575 |
fillDisplayArea(0, NLignePPageSpinner.getSelection()); |
... | ... | |
560 | 577 |
viewer.getTable().showSelection(); |
561 | 578 |
} |
562 | 579 |
}); |
563 |
|
|
580 |
|
|
564 | 581 |
// compose infosArea |
565 | 582 |
// infosArea.setLayout(new GridLayout(6, false)); |
566 |
|
|
583 |
|
|
567 | 584 |
navigationArea = new NavigationWidget(filtercontrols, SWT.NONE); |
568 | 585 |
navigationArea.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, |
569 | 586 |
false)); |
570 |
|
|
587 |
|
|
571 | 588 |
navigationArea.addFirstListener(new SelectionListener() { |
589 |
|
|
572 | 590 |
@Override |
573 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
574 |
} |
|
575 |
|
|
591 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
592 |
|
|
576 | 593 |
@Override |
577 | 594 |
public void widgetSelected(SelectionEvent e) { |
578 | 595 |
fillDisplayArea(0, NLignePPageSpinner.getSelection()); |
... | ... | |
581 | 598 |
} |
582 | 599 |
}); |
583 | 600 |
navigationArea.addLastListener(new SelectionListener() { |
601 |
|
|
584 | 602 |
@Override |
585 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
586 |
} |
|
587 |
|
|
603 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
604 |
|
|
588 | 605 |
@Override |
589 | 606 |
public void widgetSelected(SelectionEvent e) { |
590 | 607 |
int top = (queryindex.getV() / NLignePPageSpinner |
... | ... | |
596 | 613 |
} |
597 | 614 |
}); |
598 | 615 |
navigationArea.addNextListener(new SelectionListener() { |
616 |
|
|
599 | 617 |
@Override |
600 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
601 |
} |
|
602 |
|
|
618 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
619 |
|
|
603 | 620 |
@Override |
604 | 621 |
public void widgetSelected(SelectionEvent e) { |
605 | 622 |
int top = topLine + NLignePPageSpinner.getSelection(); |
... | ... | |
610 | 627 |
} |
611 | 628 |
}); |
612 | 629 |
navigationArea.addPreviousListener(new SelectionListener() { |
630 |
|
|
613 | 631 |
@Override |
614 |
public void widgetDefaultSelected(SelectionEvent e) { |
|
615 |
} |
|
616 |
|
|
632 |
public void widgetDefaultSelected(SelectionEvent e) {} |
|
633 |
|
|
617 | 634 |
@Override |
618 | 635 |
public void widgetSelected(SelectionEvent e) { |
619 | 636 |
int top = topLine - NLignePPageSpinner.getSelection(); |
... | ... | |
625 | 642 |
viewer.getTable().showSelection(); |
626 | 643 |
} |
627 | 644 |
}); |
628 |
|
|
645 |
|
|
629 | 646 |
// Labels |
630 | 647 |
lTInfo = new Label(filtercontrols, SWT.NONE); |
631 | 648 |
lTInfo.setText(""); //$NON-NLS-1$ |
632 | 649 |
lTInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); |
633 |
|
|
650 |
|
|
634 | 651 |
lVInfo = new Label(filtercontrols, SWT.NONE); |
635 | 652 |
lVInfo.setText(""); //$NON-NLS-1$ |
636 | 653 |
lVInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); |
637 |
|
|
654 |
|
|
638 | 655 |
lFminInfo = new Label(filtercontrols, SWT.NONE); |
639 | 656 |
lFminInfo.setText(""); //$NON-NLS-1$ |
640 | 657 |
lFminInfo |
641 | 658 |
.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); |
642 |
|
|
659 |
|
|
643 | 660 |
lFmaxInfo = new Label(filtercontrols, SWT.NONE); |
644 | 661 |
lFmaxInfo.setText(""); //$NON-NLS-1$ |
645 | 662 |
lFmaxInfo |
646 | 663 |
.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); |
647 |
|
|
664 |
|
|
648 | 665 |
// results |
649 | 666 |
viewer = new TableViewer(resultArea, SWT.MULTI | SWT.FULL_SELECTION |
650 | 667 |
| SWT.BORDER); |
... | ... | |
660 | 677 |
fD.getHeight(), fD.getStyle()); |
661 | 678 |
viewer.getTable().setFont(font); |
662 | 679 |
} |
663 |
|
Formats disponibles : Unified diff