Révision 999
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java (revision 999) | ||
---|---|---|
558 | 558 |
public static String common_end; |
559 | 559 |
public static String TxmBrowser_8; |
560 | 560 |
public static String TxmBrowser_9; |
561 |
public static String TXMEditor_0; |
|
562 |
|
|
563 |
public static String TXMEditor_1; |
|
564 |
|
|
565 |
public static String TXMEditor_2; |
|
566 |
|
|
567 |
public static String TXMEditor_3; |
|
568 |
|
|
569 |
public static String TXMEditor_7; |
|
570 |
|
|
561 | 571 |
public static String TxtEditor_0; |
562 | 572 |
public static String TxtEditor_1; |
563 | 573 |
public static String UIParameterException_0; |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties (revision 999) | ||
---|---|---|
680 | 680 |
TxmBrowser_6 = Next page |
681 | 681 |
TxmBrowser_8 = Next text |
682 | 682 |
TxmBrowser_9 = Previous text |
683 |
TXMEditor_0=Computing |
|
684 |
TXMEditor_1=Computing |
|
685 |
TXMEditor_2=Computing |
|
686 |
TXMEditor_3=Parameters |
|
687 |
TXMEditor_7=Show/Hide command parameters |
|
683 | 688 |
|
684 | 689 |
TxtEditor_0 = TextEditor: |
685 | 690 |
TxtEditor_1 = Encoding found |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties (revision 999) | ||
---|---|---|
54 | 54 |
ApplicationWorkbenchAdvisor_31 = ** Échec de la création de l'espace de travail 'default.xml' |
55 | 55 |
ApplicationWorkbenchAdvisor_34 = ** Échec : le dossier de sauvegarde des corpus n'a pas pu être créé |
56 | 56 |
ApplicationWorkbenchAdvisor_37 = \ vers |
57 |
|
|
58 | 57 |
ApplicationWorkbenchAdvisor_41 = ** Échec de réglage des préférences : {0} |
59 | 58 |
ApplicationWorkbenchAdvisor_43 = Les corpus {0} ont été mis à jour avec une version plus récente. |
60 | 59 |
ApplicationWorkbenchAdvisor_43_single = Le corpus {0} a été mis à jour avec une version plus récente. |
... | ... | |
589 | 588 |
|
590 | 589 |
Submit_0 = Enregistrer |
591 | 590 |
|
591 |
TXMEditor_0 = Calcul |
|
592 |
TXMEditor_1 = Calcul |
|
593 |
TXMEditor_2 = Calcul |
|
594 |
TXMEditor_3 = Paramètres |
|
595 |
TXMEditor_7 = Afficher/Masquer les paramètres de commande |
|
596 |
|
|
592 | 597 |
TablableVector_0 = Les deux tables doivent être de même taille. |
593 | 598 |
|
594 | 599 |
TableEditor_0 = Impossible d'afficher un tableau avec les informations fourniesn: {0} |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java (revision 999) | ||
---|---|---|
65 | 65 |
import org.txm.rcp.StatusLine; |
66 | 66 |
import org.txm.rcp.TXMWindows; |
67 | 67 |
import org.txm.rcp.handlers.BaseAbstractHandler; |
68 |
import org.txm.rcp.messages.TXMUIMessages; |
|
68 | 69 |
import org.txm.rcp.swt.GLComposite; |
69 | 70 |
import org.txm.rcp.swt.widget.AssistedQueryWidget; |
70 | 71 |
import org.txm.rcp.swt.widget.FloatSpinner; |
... | ... | |
97 | 98 |
*/ |
98 | 99 |
public final static String TOP_TOOLBAR_ID = "TXMEditorTopToolBar"; //$NON-NLS-1$ |
99 | 100 |
public final static String BOTTOM_TOOLBAR_ID = "TXMEditorBottomToolBar"; //$NON-NLS-1$ |
100 |
public final static String COMPUTING_PARAMETERS_GROUP_ID = "Parameters"; //$NON-NLS-1$
|
|
101 |
public final static String COMPUTING_PARAMETERS_GROUP_ID = TXMUIMessages.TXMEditor_3;
|
|
101 | 102 |
|
102 | 103 |
/** |
103 | 104 |
* The editor main tool bar, positioned at the top of the editor. |
... | ... | |
177 | 178 |
|
178 | 179 |
// fetch extensions |
179 | 180 |
IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(TXMEditorExtension.EXTENSION_ID); |
180 |
Log.warning("Installing TXMEditorExtension..."); |
|
181 |
Log.warning("Installing TXMEditorExtension..."); //$NON-NLS-1$
|
|
181 | 182 |
Log.warning(Arrays.toString(config)); |
182 | 183 |
|
183 | 184 |
for (IConfigurationElement e : config) { |
184 | 185 |
try { |
185 |
Log.warning(" "+e.getName()+" from "+e.getContributor().getName()); |
|
186 |
Log.warning(" "+e.getName()+" from "+e.getContributor().getName()); //$NON-NLS-1$ //$NON-NLS-2$
|
|
186 | 187 |
final Object o = e.createExecutableExtension("class"); //$NON-NLS-1$ |
187 | 188 |
if (o instanceof TXMEditorExtension) { |
188 | 189 |
ISafeRunnable runnable = new ISafeRunnable() { |
189 | 190 |
|
190 | 191 |
@Override |
191 | 192 |
public void handleException(Throwable exception) { |
192 |
System.out.println("Error while installing: "+o+": "+ exception.getLocalizedMessage()); |
|
193 |
System.out.println("Error while installing: "+o+": "+ exception.getLocalizedMessage()); //$NON-NLS-1$ //$NON-NLS-2$
|
|
193 | 194 |
} |
194 | 195 |
|
195 | 196 |
@Override |
... | ... | |
203 | 204 |
SafeRunner.run(runnable); |
204 | 205 |
} |
205 | 206 |
} catch (Exception ex) { |
206 |
System.out.println("Exception while installing "+e.getName()+": "+ex.getLocalizedMessage()); |
|
207 |
System.out.println("Exception while installing "+e.getName()+": "+ex.getLocalizedMessage()); //$NON-NLS-1$ //$NON-NLS-2$
|
|
207 | 208 |
} |
208 | 209 |
} |
209 | 210 |
|
... | ... | |
285 | 286 |
this.initParentLayout(parent, 1); |
286 | 287 |
|
287 | 288 |
// contains the minimal panels and top toolbars |
288 |
this.firstLineComposite = new GLComposite(parent, SWT.NONE, "Editor first line"); |
|
289 |
this.firstLineComposite = new GLComposite(parent, SWT.NONE, "Editor first line"); //$NON-NLS-1$
|
|
289 | 290 |
this.firstLineComposite.getLayout().numColumns = 2; |
290 | 291 |
this.firstLineComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false)); |
291 | 292 |
|
292 |
this.mainParametersComposite = new GLComposite(firstLineComposite, SWT.NONE, "Main parameters area"); |
|
293 |
this.mainParametersComposite = new GLComposite(firstLineComposite, SWT.NONE, "Main parameters area"); //$NON-NLS-1$
|
|
293 | 294 |
this.mainParametersComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false)); |
294 | 295 |
this.mainParametersComposite.getLayout().horizontalSpacing = 5; |
295 | 296 |
|
296 |
this.extendedParametersGroupsComposite = new GLComposite(parent, SWT.NONE, "Extended parameters area"); |
|
297 |
this.extendedParametersGroupsComposite = new GLComposite(parent, SWT.NONE, "Extended parameters area"); //$NON-NLS-1$
|
|
297 | 298 |
this.extendedParametersGroupsComposite.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); |
298 | 299 |
|
299 | 300 |
this.topToolBar = new TXMEditorToolBar(this, this.firstLineComposite, this.extendedParametersGroupsComposite, SWT.FLAT | SWT.RIGHT, TOP_TOOLBAR_ID); |
... | ... | |
306 | 307 |
// if(!this.getResult().canCompute() && this.getResult().isDirty()) { |
307 | 308 |
// showExtendedParameters = true; |
308 | 309 |
// } |
309 |
this.extendedParametersComposite = this.topToolBar.installGroup(COMPUTING_PARAMETERS_GROUP_ID, "Show/Hide command parameters",
|
|
310 |
"icons/show_computing_parameters.png", |
|
311 |
"icons/hide_computing_parameters.png", |
|
310 |
this.extendedParametersComposite = this.topToolBar.installGroup(COMPUTING_PARAMETERS_GROUP_ID, TXMUIMessages.TXMEditor_7,
|
|
311 |
"icons/show_computing_parameters.png", //$NON-NLS-1$
|
|
312 |
"icons/hide_computing_parameters.png", //$NON-NLS-1$
|
|
312 | 313 |
showExtendedParameters); |
313 | 314 |
|
314 | 315 |
// display main area |
315 |
this.resultArea = new GLComposite(parent, SWT.NONE, "Result area"); |
|
316 |
this.resultArea = new GLComposite(parent, SWT.NONE, "Result area"); //$NON-NLS-1$
|
|
316 | 317 |
this.resultArea.setLayoutData(new GridData(GridData.FILL_BOTH)); |
317 | 318 |
|
318 | 319 |
// create the bottom tool bar |
... | ... | |
324 | 325 |
//rl.justify = true; |
325 | 326 |
this.bottomToolBarContainer.setLayout(rl); |
326 | 327 |
|
327 |
this.bottomSubWidgetsComposite = new GLComposite(parent, SWT.NONE, "Bottom parameters area"); |
|
328 |
this.bottomSubWidgetsComposite = new GLComposite(parent, SWT.NONE, "Bottom parameters area"); //$NON-NLS-1$
|
|
328 | 329 |
if (parent.getLayout() instanceof GridLayout) { |
329 | 330 |
this.bottomSubWidgetsComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false)); |
330 | 331 |
} |
331 | 332 |
|
332 | 333 |
|
333 |
this.bottomToolBar = new TXMEditorToolBar(this, this.bottomToolBarContainer, this.bottomSubWidgetsComposite, SWT.FLAT, "bottom"); |
|
334 |
this.bottomToolBar = new TXMEditorToolBar(this, this.bottomToolBarContainer, this.bottomSubWidgetsComposite, SWT.FLAT, "bottom"); //$NON-NLS-1$
|
|
334 | 335 |
|
335 | 336 |
|
336 |
this.notifyExtensions("notifyStartOfCreatePartControl"); |
|
337 |
this.notifyExtensions("notifyStartOfCreatePartControl"); //$NON-NLS-1$
|
|
337 | 338 |
this._createPartControl(); // child editor create its parameters and display widgets |
338 |
this.notifyExtensions("notifyEndOfCreatePartControl"); |
|
339 |
this.notifyExtensions("notifyEndOfCreatePartControl"); //$NON-NLS-1$
|
|
339 | 340 |
|
340 | 341 |
// remove empty toolbar |
341 | 342 |
//TODO SJ: Hack? MD: yeah -> need to find a way to not display the bottom toolbar on Windows instead |
... | ... | |
355 | 356 |
} |
356 | 357 |
} |
357 | 358 |
catch(Throwable e) { |
358 |
System.err.println("TXMEditor.createPartControl(): can not create the editor for result " + this.getResult() + ".");
|
|
359 |
Log.severe("TXMEditor.createPartControl(): can not create the editor for result " + this.getResult() + "."); //$NON-NLS-1$ //$NON-NLS-2$
|
|
359 | 360 |
e.printStackTrace(); |
360 | 361 |
createPartControlDoneSucessfully = false; |
361 | 362 |
} |
... | ... | |
380 | 381 |
* @throws NoSuchMethodException |
381 | 382 |
*/ |
382 | 383 |
protected void notifyExtensions(final String step) { |
383 |
if (!step.startsWith("notify")) return; |
|
384 |
if (!step.startsWith("notify")) return; //$NON-NLS-1$
|
|
384 | 385 |
|
385 | 386 |
for (final TXMEditorExtension<T> ext : extensions) { |
386 | 387 |
// ISafeRunnable runnable = new ISafeRunnable() { |
... | ... | |
472 | 473 |
// getResult().saveParameters(); |
473 | 474 |
// } |
474 | 475 |
|
475 |
notifyExtensions("notifyDoSave"); |
|
476 |
notifyExtensions("notifyDoSave"); //$NON-NLS-1$
|
|
476 | 477 |
firePropertyChange(IEditorPart.PROP_DIRTY); |
477 | 478 |
} |
478 | 479 |
|
... | ... | |
482 | 483 |
} |
483 | 484 |
|
484 | 485 |
public void dispose() { |
485 |
notifyExtensions("notifyDispose"); |
|
486 |
notifyExtensions("notifyDispose"); //$NON-NLS-1$
|
|
486 | 487 |
super.dispose(); |
487 | 488 |
} |
488 | 489 |
|
... | ... | |
602 | 603 |
*/ |
603 | 604 |
public JobHandler compute(final boolean update) { |
604 | 605 |
|
605 |
StatusLine.setMessage("Computing " + this.getResult().getName());
|
|
606 |
StatusLine.setMessage(TXMUIMessages.TXMEditor_0 + this.getResult().getName());
|
|
606 | 607 |
|
607 |
JobHandler job = new JobHandler("Computing " + this.getResult().getName()) {
|
|
608 |
JobHandler job = new JobHandler(TXMUIMessages.TXMEditor_1 + this.getResult().getName()) {
|
|
608 | 609 |
|
609 | 610 |
@Override |
610 | 611 |
protected IStatus run(IProgressMonitor monitor) { |
... | ... | |
619 | 620 |
public void run() { |
620 | 621 |
if(update) { |
621 | 622 |
// FIXME: DEbug |
622 |
System.err.println("TXMEditor.compute(): manually updating result from editor."); |
|
623 |
System.err.println("TXMEditor.compute(): manually updating result from editor."); //$NON-NLS-1$
|
|
623 | 624 |
updateResultFromEditor(); // subclasses manual result updating from editor fields |
624 | 625 |
// FIXME: DEbug |
625 |
System.err.println("TXMEditor.compute(): auto updating result from editor."); |
|
626 |
System.err.println("TXMEditor.compute(): auto updating result from editor."); //$NON-NLS-1$
|
|
626 | 627 |
autoUpdateResultFromEditorParameters(); // auto updating result from Parameter annotations in result <=> editor |
627 | 628 |
|
628 | 629 |
// Stores the last parameters before the computing to later auto-update the Widgets only if some parameters have changed |
... | ... | |
633 | 634 |
|
634 | 635 |
|
635 | 636 |
// computing result |
636 |
monitor.beginTask("Computing", 100);
|
|
637 |
monitor.beginTask(TXMUIMessages.TXMEditor_2, 100);
|
|
637 | 638 |
|
638 |
notifyExtensions("notifyStartOfCompute"); |
|
639 |
notifyExtensions("notifyStartOfCompute"); //$NON-NLS-1$
|
|
639 | 640 |
if (!TXMEditor.this.getResult().compute(monitor)) { |
640 |
Log.info("TXMEditor.compute(): computing failed."); |
|
641 |
Log.info("TXMEditor.compute(): computing failed."); //$NON-NLS-1$
|
|
641 | 642 |
} |
642 |
notifyExtensions("notifyEndOfCompute"); |
|
643 |
notifyExtensions("notifyEndOfCompute"); //$NON-NLS-1$
|
|
643 | 644 |
|
644 | 645 |
monitor.worked(50); |
645 | 646 |
|
... | ... | |
650 | 651 |
try { |
651 | 652 |
refresh(update); |
652 | 653 |
} catch (Exception e) { |
653 |
System.out.println("Error while refreshing editor: "+e); |
|
654 |
System.out.println("Error while refreshing editor: "+e); //$NON-NLS-1$
|
|
654 | 655 |
Log.printStackTrace(e); |
655 | 656 |
} |
656 | 657 |
} |
... | ... | |
730 | 731 |
*/ |
731 | 732 |
public final void refresh(boolean update) throws Exception { |
732 | 733 |
if (!createPartControlDoneSucessfully) return; // no refresh |
733 |
notifyExtensions("notifyStartOfRefresh"); |
|
734 |
notifyExtensions("notifyStartOfRefresh"); //$NON-NLS-1$
|
|
734 | 735 |
|
735 | 736 |
// FIXME: result should never be null? |
736 | 737 |
if (this.getResult() != null) { |
... | ... | |
743 | 744 |
// from fields themselves |
744 | 745 |
//if (!update) { |
745 | 746 |
// FIXME: debug |
746 |
Log.finest("TXMEditor.refresh(): auto updating editor from result."); |
|
747 |
Log.finest("TXMEditor.refresh(): auto updating editor from result."); //$NON-NLS-1$
|
|
747 | 748 |
this.autoUpdateEditorFieldsFromResult(update); // auto update from Parameter annotations |
748 | 749 |
|
749 | 750 |
// FIXME: debug |
750 |
Log.finest("TXMEditor.refresh(): updating subclass editor (" + getClass().getSimpleName() + ") from result."); |
|
751 |
Log.finest("TXMEditor.refresh(): updating subclass editor (" + getClass().getSimpleName() + ") from result."); //$NON-NLS-1$ //$NON-NLS-2$
|
|
751 | 752 |
this.updateEditorFromResult(update); // subclasses manual settings |
752 | 753 |
//} |
753 | 754 |
|
... | ... | |
782 | 783 |
|
783 | 784 |
|
784 | 785 |
} |
785 |
notifyExtensions("notifyEndOfRefresh"); |
|
786 |
notifyExtensions("notifyEndOfRefresh"); //$NON-NLS-1$
|
|
786 | 787 |
} |
787 | 788 |
|
788 | 789 |
/** |
... | ... | |
895 | 896 |
|
896 | 897 |
// FIXME: debug |
897 | 898 |
if(object != null) { |
898 |
String message = "TXMEditor.autoUpdateEditorFieldsFromResult(): setting editor parameter " + parameter.key() + " = " + value; |
|
899 |
String message = "TXMEditor.autoUpdateEditorFieldsFromResult(): setting editor parameter " + parameter.key() + " = " + value; //$NON-NLS-1$ //$NON-NLS-2$
|
|
899 | 900 |
if(value != null) { |
900 |
message += " (" + value.getClass() + " to object " + object + ")"; |
|
901 |
message += " (" + value.getClass() + " to object " + object + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
|
901 | 902 |
} |
902 | 903 |
Log.finest(message); |
903 | 904 |
} |
... | ... | |
1002 | 1003 |
} |
1003 | 1004 |
catch (IllegalArgumentException e) { |
1004 | 1005 |
// TODO Auto-generated catch block |
1005 |
System.err.println("TXMEditor.autoUpdateResultFromEditorParameters(): Error with field " + parameter.key()); |
|
1006 |
System.err.println("TXMEditor.autoUpdateResultFromEditorParameters(): Error with field " + parameter.key()); //$NON-NLS-1$
|
|
1006 | 1007 |
e.printStackTrace(); |
1007 | 1008 |
} |
1008 | 1009 |
catch (IllegalAccessException e) { |
... | ... | |
1043 | 1044 |
try { |
1044 | 1045 |
return this.getEditorInput().deleteResult(); |
1045 | 1046 |
} catch(Exception e) { |
1046 |
System.out.println("Error: could not delete result: " + e.getLocalizedMessage()); |
|
1047 |
System.out.println("Error: could not delete result: " + e.getLocalizedMessage()); //$NON-NLS-1$
|
|
1047 | 1048 |
Log.printStackTrace(e); |
1048 | 1049 |
return false; |
1049 | 1050 |
} |
... | ... | |
1242 | 1243 |
this.linkedEditors.add(editor); |
1243 | 1244 |
|
1244 | 1245 |
// Debug |
1245 |
Log.finest(this.getClass().getSimpleName() + ": A linked editor of type \"" + editor.getClass().getSimpleName() + "\" has been added to this one. Linked editors count: " + this.linkedEditors.size() + "."); |
|
1246 |
Log.finest(this.getClass().getSimpleName() + ": A linked editor of type \"" + editor.getClass().getSimpleName() + "\" has been added to this one. Linked editors count: " + this.linkedEditors.size() + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
|
1246 | 1247 |
|
1247 | 1248 |
// FIXME: temporary solution to break the link with chart editor from another TXM result editor when its closed |
1248 | 1249 |
// a better solution would be to redefine the onclose event in a root class of all TXM editors |
... | ... | |
1293 | 1294 |
if(this.linkedEditors != null) { |
1294 | 1295 |
if(this.linkedEditors.remove(editor)) { |
1295 | 1296 |
// Debug |
1296 |
Log.finest(this.getClass().getSimpleName() + ": A linked editor of type \"" + editor.getClass().getSimpleName() + "\" has been removed from this one. Linked editors count: " + this.linkedEditors.size() + "."); |
|
1297 |
Log.finest(this.getClass().getSimpleName() + ": A linked editor of type \"" + editor.getClass().getSimpleName() + "\" has been removed from this one. Linked editors count: " + this.linkedEditors.size() + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
|
1297 | 1298 |
} |
1298 | 1299 |
} |
1299 | 1300 |
if(this.linkedEditors.isEmpty()) { |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditorToolBar.java (revision 999) | ||
---|---|---|
255 | 255 |
group.setVisible(false); |
256 | 256 |
|
257 | 257 |
// add finally a button to the toolbar to show/hide the Group |
258 |
|
|
259 |
final OpenCloseToolItem showParameters = new OpenCloseToolItem(this, groupTitle, openIconFilePath, closeIconFilePath); |
|
260 |
// if (iconFilePath != null) { |
|
261 |
// showParameters.setImage(IImageKeys.getImage(iconFilePath)); |
|
262 |
// } |
|
263 |
// // if no icon specified, show the group title in the toolitem |
|
264 |
// else { |
|
265 |
// showParameters.setText(groupTitle); |
|
266 |
// } |
|
267 |
// |
|
268 |
// if (buttonToolTip != null) { |
|
269 |
// showParameters.setToolTipText(buttonToolTip); |
|
270 |
// } |
|
271 |
|
|
258 |
final OpenCloseToolItem showParameters = new OpenCloseToolItem(this, groupTitle, openIconFilePath, closeIconFilePath, buttonToolTip); |
|
272 | 259 |
this.setVisible(group, showGroup); // default init |
273 | 260 |
|
274 | 261 |
showParameters.addSelectionListener(new SelectionListener() { |
... | ... | |
281 | 268 |
@Override |
282 | 269 |
public void widgetDefaultSelected(SelectionEvent e) { } |
283 | 270 |
}); |
284 |
//TODO add an optional selection listener |
|
285 |
//showParameters.addSelectionListener(selectionListener); |
|
286 | 271 |
|
287 | 272 |
this.groups.put(groupTitle, group); |
288 | 273 |
this.buttons.put(groupTitle, showParameters); |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/toolbar/OpenCloseToolItem.java (revision 999) | ||
---|---|---|
16 | 16 |
*/ |
17 | 17 |
public class OpenCloseToolItem extends ToolItem { |
18 | 18 |
|
19 |
|
|
19 | 20 |
/** |
20 | 21 |
* |
21 | 22 |
* @param parent |
23 |
* @param title |
|
24 |
* @param openIconFilePath |
|
25 |
* @param closeIconFilePath |
|
26 |
*/ |
|
27 |
public OpenCloseToolItem(ToolBar parent, String title, String openIconFilePath, String closeIconFilePath) { |
|
28 |
this(parent, title, openIconFilePath, closeIconFilePath, null); |
|
29 |
} |
|
30 |
|
|
31 |
/** |
|
32 |
* |
|
33 |
* @param parent |
|
22 | 34 |
* @param title used as Text if openIconFilePath icon is not set, and as ToolTip text if openIconFilePath icon is set |
23 | 35 |
* @param openIconFilePath |
24 | 36 |
* @param closeIconFilePath |
25 | 37 |
*/ |
26 |
public OpenCloseToolItem(ToolBar parent, String title, String openIconFilePath, String closeIconFilePath) { |
|
38 |
public OpenCloseToolItem(ToolBar parent, String title, String openIconFilePath, String closeIconFilePath, String buttonTooltip) {
|
|
27 | 39 |
super(parent, SWT.CHECK); |
28 | 40 |
|
29 | 41 |
if (openIconFilePath != null) { |
30 | 42 |
openIcon = IImageKeys.getImage(openIconFilePath); |
31 | 43 |
this.setImage(openIcon); |
32 |
this.setToolTipText(title); |
|
33 | 44 |
if (closeIconFilePath != null) { |
34 | 45 |
closeIcon = IImageKeys.getImage(closeIconFilePath); |
35 | 46 |
} |
36 | 47 |
} else { |
37 | 48 |
this.setText(title); |
38 | 49 |
} |
50 |
|
|
51 |
if(buttonTooltip != null) { |
|
52 |
this.setToolTipText(buttonTooltip); |
|
53 |
} |
|
54 |
else { |
|
55 |
this.setToolTipText(title); |
|
56 |
} |
|
39 | 57 |
|
40 | 58 |
this.addSelectionListener(new SelectionListener() { |
41 | 59 |
|
tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java (revision 999) | ||
---|---|---|
27 | 27 |
// |
28 | 28 |
package org.txm.specificities.rcp.editors; |
29 | 29 |
|
30 |
import java.text.Collator; |
|
31 |
import java.util.Locale; |
|
32 |
|
|
33 | 30 |
import org.eclipse.jface.viewers.ArrayContentProvider; |
34 | 31 |
import org.eclipse.jface.viewers.ISelection; |
35 | 32 |
import org.eclipse.jface.viewers.TableViewer; |
36 | 33 |
import org.eclipse.osgi.util.NLS; |
37 | 34 |
import org.eclipse.swt.SWT; |
38 | 35 |
import org.eclipse.swt.layout.GridData; |
39 |
import org.eclipse.swt.layout.GridLayout; |
|
40 | 36 |
import org.eclipse.swt.widgets.Composite; |
41 | 37 |
import org.eclipse.swt.widgets.Label; |
42 | 38 |
import org.eclipse.swt.widgets.ScrollBar; |
... | ... | |
46 | 42 |
import org.txm.Toolbox; |
47 | 43 |
import org.txm.core.messages.TXMCoreMessages; |
48 | 44 |
import org.txm.core.results.Parameter; |
49 |
import org.txm.objects.TxmObject; |
|
50 | 45 |
import org.txm.rcp.editors.TXMEditor; |
51 | 46 |
import org.txm.rcp.editors.TableKeyListener; |
52 | 47 |
import org.txm.rcp.swt.GLComposite; |
... | ... | |
185 | 180 |
specificitesTable.setSortDirection(SWT.UP); |
186 | 181 |
|
187 | 182 |
} catch (Exception e) { |
188 |
System.err.println(NLS.bind(SpecificitiesUIMessages.SpecificitiesTableEditor_0, e.getMessage()));
|
|
189 |
e.printStackTrace();
|
|
183 |
Log.severe(NLS.bind(SpecificitiesUIMessages.SpecificitiesTableEditor_0, e.getMessage()));
|
|
184 |
Log.printStackTrace(e);
|
|
190 | 185 |
} |
191 | 186 |
} |
192 | 187 |
|
... | ... | |
204 | 199 |
partNames = this.getResult().getPartShortNames(); |
205 | 200 |
partSize = this.getResult().getPartSizes(); |
206 | 201 |
} catch (Exception e) { |
207 |
System.err.println(NLS.bind(RCoreMessages.error_unexpectedErrorInRStatisticsEngine, e));
|
|
202 |
Log.severe(NLS.bind(RCoreMessages.error_unexpectedErrorInRStatisticsEngine, e));
|
|
208 | 203 |
Log.printStackTrace(e); |
209 | 204 |
return; |
210 | 205 |
} |
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages.properties (revision 999) | ||
---|---|---|
19 | 19 |
SWTChartsComponentProvider_SHOW_HIDE_TITLE = Show/hide title |
20 | 20 |
SWTChartsComponentProvider_SHOW_LEGEND = Show legend |
21 | 21 |
SWTChartsComponentProvider_SHOW_TITLE = Show title |
22 |
toolbar_rendering=Rendering |
|
23 |
toolbar_showHideRenderingParameters=Show/Hide rendering parameters |
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/SWTComponentsProviderMessages.java (revision 999) | ||
---|---|---|
31 | 31 |
public static String SWTChartsComponentProvider_SHOW_HIDE_LEGEND; |
32 | 32 |
public static String SWTChartsComponentProvider_SHOW_HIDE_GRID; |
33 | 33 |
|
34 |
public static String toolbar_rendering; |
|
35 |
|
|
36 |
public static String toolbar_showHideRenderingParameters; |
|
37 |
|
|
34 | 38 |
|
35 | 39 |
|
36 | 40 |
static { |
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages_fr.properties (revision 999) | ||
---|---|---|
18 | 18 |
SWTChartsComponentProvider_SHOW_HIDE_LEGEND = Afficher/masquer la légende |
19 | 19 |
SWTChartsComponentProvider_SHOW_LEGEND = Afficher la légende |
20 | 20 |
SWTChartsComponentProvider_SHOW_TITLE = Afficher le titre |
21 |
|
|
22 |
toolbar_rendering = Rendu |
|
23 |
toolbar_showHideRenderingParameters = Afficher/Masquer les paramètres de rendu |
tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java (revision 999) | ||
---|---|---|
22 | 22 |
import org.txm.chartsengine.rcp.SWTChartsComponentsProvider; |
23 | 23 |
import org.txm.chartsengine.rcp.events.EventCallBack; |
24 | 24 |
import org.txm.chartsengine.rcp.events.EventCallBackHandler; |
25 |
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages; |
|
25 | 26 |
import org.txm.chartsengine.rcp.swt.AdvancedChartEditorToolBar; |
26 | 27 |
import org.txm.chartsengine.rcp.swt.ChartComposite; |
27 | 28 |
import org.txm.chartsengine.rcp.swt.ChartEditorToolBar; |
... | ... | |
115 | 116 |
|
116 | 117 |
// Advanced tool bar |
117 | 118 |
//this.advancedToolBarComposite = new Composite(parent, SWT.NONE); |
118 |
Group group = this.topToolBar.installGroup("Rendering", "Show/Hide rendering parameters",
|
|
119 |
"platform:/plugin/org.txm.chartsengine.rcp/icons/show_rendering_parameters.png", |
|
120 |
"platform:/plugin/org.txm.chartsengine.rcp/icons/hide_rendering_parameters.png", |
|
119 |
Group group = this.topToolBar.installGroup(SWTComponentsProviderMessages.toolbar_rendering, SWTComponentsProviderMessages.toolbar_showHideRenderingParameters,
|
|
120 |
"platform:/plugin/org.txm.chartsengine.rcp/icons/show_rendering_parameters.png", //$NON-NLS-1$
|
|
121 |
"platform:/plugin/org.txm.chartsengine.rcp/icons/hide_rendering_parameters.png", //$NON-NLS-1$
|
|
121 | 122 |
false); |
122 | 123 |
this.advancedChartToolBar = new AdvancedChartEditorToolBar(this, group, this.getParametersGroupsComposite(), SWT.FLAT); |
123 | 124 |
//this.advancedChartToolBar.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE)); |
... | ... | |
221 | 222 |
// check that the charts engine used for the result matches the SWT components provider otherwise find a suitable components provider |
222 | 223 |
if(this.getResult().getChartsEngine() != this.getSWTChartsComponentsProvider().getChartsEngine()) { |
223 | 224 |
|
224 |
Log.finest("ChartEditor.__updateEditorFromResult(): result charts engine = " + this.getResult().getChartsEngine().getName() + " / Editor charts engine = " + this.getSWTChartsComponentsProvider().getChartsEngine().getName() + "."); //$NON-NLS-1$ |
|
225 |
Log.finest("ChartEditor.__updateEditorFromResult(): result charts engine = " + this.getResult().getChartsEngine().getName() + " / Editor charts engine = " + this.getSWTChartsComponentsProvider().getChartsEngine().getName() + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
|
225 | 226 |
|
226 | 227 |
this.getEditorInput().setSWTChartsComponentsProvider(SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine())); |
227 | 228 |
this.getSWTChartsComponentsProvider().setChartsEngine(this.getResult().getChartsEngine()); |
228 | 229 |
|
229 |
Log.finest("ChartEditor.__updateEditorFromResult(): charts engine used to create the chart does not match the editor one. The SWT components provider has been changed to match it: " + this.getSWTChartsComponentsProvider() + "."); //$NON-NLS-1$ |
|
230 |
Log.finest("ChartEditor.__updateEditorFromResult(): charts engine used to create the chart does not match the editor one. The SWT components provider has been changed to match it: " + this.getSWTChartsComponentsProvider() + "."); //$NON-NLS-1$ //$NON-NLS-2$
|
|
230 | 231 |
|
231 | 232 |
// recreating the chart composite |
232 | 233 |
Composite parent = this.chartComposite.getParent(); |
... | ... | |
243 | 244 |
boolean needInit = (this.chartComposite.getChartComponent() == null) && (this.getResult().getChart() != null); |
244 | 245 |
|
245 | 246 |
// loading chart |
246 |
this.getResult().subTask("Loading chart."); |
|
247 |
this.getResult().subTask("Loading chart."); //$NON-NLS-1$
|
|
247 | 248 |
this.loadChart(); |
248 | 249 |
|
249 | 250 |
|
... | ... | |
328 | 329 |
contributions[i].getAttribute("resultDataClass") != null //$NON-NLS-1$ |
329 | 330 |
&& contributions[i].getAttribute("resultDataClass").equals(this.getResult().getClass().getName()) //$NON-NLS-1$ |
330 | 331 |
|
331 |
&& ((contributions[i].getAttribute("chartType") == null && this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE) |
|
332 |
&& ((contributions[i].getAttribute("chartType") == null && this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE) //$NON-NLS-1$
|
|
332 | 333 |
|| |
333 |
contributions[i].getAttribute("chartType") != null && !this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE) && contributions[i].getAttribute("chartType").equals(this.getChartType()) |
|
334 |
contributions[i].getAttribute("chartType") != null && !this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE) && contributions[i].getAttribute("chartType").equals(this.getChartType()) //$NON-NLS-1$ //$NON-NLS-2$
|
|
334 | 335 |
) //$NON-NLS-1$ |
335 | 336 |
) |
336 | 337 |
|
Formats disponibles : Unified diff