Révision 1730
| tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java (revision 1730) | ||
|---|---|---|
| 39 | 39 |
import java.util.regex.Pattern; |
| 40 | 40 |
import java.util.regex.PatternSyntaxException; |
| 41 | 41 |
|
| 42 |
import org.apache.commons.lang.StringUtils; |
|
| 42 | 43 |
import org.txm.chartsengine.core.results.ChartResult; |
| 43 | 44 |
import org.txm.chartsengine.r.core.themes.DefaultTheme; |
| 44 | 45 |
import org.txm.core.preferences.TBXPreferences; |
| ... | ... | |
| 787 | 788 |
@Override |
| 788 | 789 |
public String getSimpleName() {
|
| 789 | 790 |
try {
|
| 790 |
String output = this.queries.toString();
|
|
| 791 |
String output = StringUtils.join(this.queries, ","); //$NON-NLS-1$
|
|
| 791 | 792 |
if (this.propertyRegex != null) {
|
| 792 | 793 |
output += " " + this.propertyRegex; //$NON-NLS-1$ |
| 793 | 794 |
} |
| tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java (revision 1730) | ||
|---|---|---|
| 27 | 27 |
import org.txm.chartsengine.core.preferences.ChartsEnginePreferences; |
| 28 | 28 |
import org.txm.chartsengine.r.core.themes.DefaultTheme; |
| 29 | 29 |
import org.txm.chartsengine.rcp.editors.ChartEditor; |
| 30 |
import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
|
|
| 30 |
import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
|
|
| 31 | 31 |
import org.txm.core.messages.TXMCoreMessages; |
| 32 | 32 |
import org.txm.core.preferences.TXMPreferences; |
| 33 | 33 |
import org.txm.core.results.Parameter; |
| ... | ... | |
| 315 | 315 |
|
| 316 | 316 |
// Lines styles |
| 317 | 317 |
multipleLineStrokes = new Button(paramPanel, SWT.CHECK); |
| 318 |
multipleLineStrokes.setText(SWTComponentsProviderMessages.multipleLineStrokeStyles);
|
|
| 318 |
multipleLineStrokes.setText(ChartsUIMessages.multipleLineStrokeStyles);
|
|
| 319 | 319 |
multipleLineStrokes.addSelectionListener(computeSelectionListener); |
| 320 | 320 |
|
| 321 | 321 |
|
| ... | ... | |
| 453 | 453 |
queryWidgets.add(this); |
| 454 | 454 |
updateMiniInfoLabelText(); |
| 455 | 455 |
|
| 456 |
|
|
| 457 | 456 |
assistedQueryWidget = new AssistedQueryWidget(this, SWT.BORDER, getResult().getCorpus()); |
| 458 | 457 |
assistedQueryWidget.setFocus(); |
| 459 | 458 |
assistedQueryWidget.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false)); |
Formats disponibles : Unified diff