Skip to content

Commit b325cee

Browse files
akurtakovakurtakov
committed
Use lambdas
Simpler code with less classes.
1 parent 88fbd87 commit b325cee

12 files changed

Lines changed: 143 additions & 316 deletions

File tree

‎openchrom/plugins/net.openchrom.chromatogram.msd.processor.supplier.massshiftdetector.ui/src/net/openchrom/chromatogram/msd/processor/supplier/massshiftdetector/ui/editors/PageSettings.java‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242
import org.eclipse.swt.SWT;
4343
import org.eclipse.swt.events.KeyAdapter;
4444
import org.eclipse.swt.events.KeyEvent;
45-
import org.eclipse.swt.events.ModifyEvent;
46-
import org.eclipse.swt.events.ModifyListener;
4745
import org.eclipse.swt.events.SelectionAdapter;
4846
import org.eclipse.swt.events.SelectionEvent;
4947
import org.eclipse.swt.layout.GridData;
@@ -433,14 +431,10 @@ private void createDescriptionSection(Composite parent) {
433431
GridData gridData = new GridData(GridData.FILL_BOTH);
434432
gridData.heightHint = 300;
435433
descriptionText.setLayoutData(gridData);
436-
descriptionText.addModifyListener(new ModifyListener() {
434+
descriptionText.addModifyListener(e -> {
437435

438-
@Override
439-
public void modifyText(ModifyEvent e) {
440-
441-
ProcessorData processorData = editorProcessor.getProcessorData();
442-
processorData.getProcessorModel().setDescription(descriptionText.getText().trim());
443-
}
436+
ProcessorData processorData = editorProcessor.getProcessorData();
437+
processorData.getProcessorModel().setDescription(descriptionText.getText().trim());
444438
});
445439
/*
446440
* Add the client to the section.
@@ -497,14 +491,7 @@ public void linkActivated(HyperlinkEvent e) {
497491
processorRawData.setReferenceChromatogramSelection(chromatogramSelections.get(0));
498492
processorRawData.setIsotopeChromatogramSelection(chromatogramSelections.get(1));
499493

500-
display.asyncExec(new Runnable() {
501-
502-
@Override
503-
public void run() {
504-
505-
updateChromatogramSelections();
506-
}
507-
});
494+
display.asyncExec(() -> updateChromatogramSelections());
508495
}
509496
});
510497
return imageHyperlink;

‎openchrom/plugins/net.openchrom.chromatogram.msd.processor.supplier.massshiftdetector.ui/src/net/openchrom/chromatogram/msd/processor/supplier/massshiftdetector/ui/wizards/PageFileSelection.java‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2025 Lablicate GmbH.
2+
* Copyright (c) 2017, 2026 Lablicate GmbH.
33
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
@@ -21,8 +21,6 @@
2121
import org.eclipse.chemclipse.ux.extension.xxd.ui.wizards.InputEntriesWizard;
2222
import org.eclipse.chemclipse.ux.extension.xxd.ui.wizards.InputWizardSettings;
2323
import org.eclipse.swt.SWT;
24-
import org.eclipse.swt.events.ModifyEvent;
25-
import org.eclipse.swt.events.ModifyListener;
2624
import org.eclipse.swt.events.SelectionAdapter;
2725
import org.eclipse.swt.events.SelectionEvent;
2826
import org.eclipse.swt.layout.GridData;
@@ -192,14 +190,7 @@ private void createNoteSection(Composite parent) {
192190
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
193191
gridData.horizontalSpan = 2;
194192
notesText.setLayoutData(gridData);
195-
notesText.addModifyListener(new ModifyListener() {
196-
197-
@Override
198-
public void modifyText(ModifyEvent e) {
199-
200-
validateData();
201-
}
202-
});
193+
notesText.addModifyListener(e -> validateData());
203194
}
204195

205196
private void createDescriptionSection(Composite parent) {
@@ -214,14 +205,7 @@ private void createDescriptionSection(Composite parent) {
214205
GridData gridData = new GridData(GridData.FILL_BOTH);
215206
gridData.horizontalSpan = 2;
216207
descriptionText.setLayoutData(gridData);
217-
descriptionText.addModifyListener(new ModifyListener() {
218-
219-
@Override
220-
public void modifyText(ModifyEvent e) {
221-
222-
validateData();
223-
}
224-
});
208+
descriptionText.addModifyListener(e -> validateData());
225209
}
226210

227211
private void validateData() {

‎openchrom/plugins/net.openchrom.chromatogram.msd.processor.supplier.massshiftdetector.ui/src/net/openchrom/chromatogram/msd/processor/supplier/massshiftdetector/ui/wizards/PageSettings.java‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2025 Lablicate GmbH.
2+
* Copyright (c) 2017, 2026 Lablicate GmbH.
33
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
@@ -15,8 +15,6 @@
1515
import org.eclipse.chemclipse.support.ui.swt.EnhancedCombo;
1616
import org.eclipse.chemclipse.support.ui.wizards.AbstractExtendedWizardPage;
1717
import org.eclipse.swt.SWT;
18-
import org.eclipse.swt.events.ModifyEvent;
19-
import org.eclipse.swt.events.ModifyListener;
2018
import org.eclipse.swt.events.SelectionAdapter;
2119
import org.eclipse.swt.events.SelectionEvent;
2220
import org.eclipse.swt.layout.GridData;
@@ -146,13 +144,7 @@ private void createStartShiftLevelSection(Composite parent) {
146144
startShiftLevelSpinner.setMinimum(MassShiftDetector.MIN_ISOTOPE_LEVEL);
147145
startShiftLevelSpinner.setMaximum(MassShiftDetector.MAX_ISOTOPE_LEVEL);
148146
startShiftLevelSpinner.setIncrement(MassShiftDetector.INCREMENT_ISOTOPE_LEVEL);
149-
startShiftLevelSpinner.addModifyListener(new ModifyListener() {
150-
151-
public void modifyText(ModifyEvent e) {
152-
153-
validateData();
154-
}
155-
});
147+
startShiftLevelSpinner.addModifyListener(e -> validateData());
156148
}
157149

158150
private void createStopShiftLevelSection(Composite parent) {
@@ -166,13 +158,7 @@ private void createStopShiftLevelSection(Composite parent) {
166158
stopShiftLevelSpinner.setMinimum(MassShiftDetector.MIN_ISOTOPE_LEVEL);
167159
stopShiftLevelSpinner.setMaximum(MassShiftDetector.MAX_ISOTOPE_LEVEL);
168160
stopShiftLevelSpinner.setIncrement(MassShiftDetector.INCREMENT_ISOTOPE_LEVEL);
169-
stopShiftLevelSpinner.addModifyListener(new ModifyListener() {
170-
171-
public void modifyText(ModifyEvent e) {
172-
173-
validateData();
174-
}
175-
});
161+
stopShiftLevelSpinner.addModifyListener(e -> validateData());
176162
}
177163

178164
private void createNormalizeDataSection(Composite parent) {
@@ -227,13 +213,7 @@ private void createNumberHighestIntensitySection(Composite parent) {
227213
numberHighestIntensityMZText = new Text(parent, SWT.BORDER);
228214
numberHighestIntensityMZText.setText("");
229215
numberHighestIntensityMZText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
230-
numberHighestIntensityMZText.addModifyListener(new ModifyListener() {
231-
232-
public void modifyText(ModifyEvent e) {
233-
234-
validateData();
235-
}
236-
});
216+
numberHighestIntensityMZText.addModifyListener(e -> validateData());
237217
}
238218

239219
private void createUsePeaksSection(Composite parent) {

‎openchrom/plugins/net.openchrom.msd.process.supplier.cms.ui/src/net/openchrom/msd/process/supplier/cms/ui/parts/swt/CompositeCompositionsUI.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2025 Walter Whitlock, Philip Wenig.
2+
* Copyright (c) 2017, 2026 Walter Whitlock, Philip Wenig.
33
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
@@ -32,9 +32,7 @@
3232
import org.eclipse.nebula.visualization.xygraph.figures.Trace;
3333
import org.eclipse.nebula.visualization.xygraph.figures.XYGraph;
3434
import org.eclipse.nebula.visualization.xygraph.util.XYGraphMediaFactory;
35-
import org.eclipse.swt.SWT;
36-
import org.eclipse.swt.events.ModifyEvent;
37-
import org.eclipse.swt.events.ModifyListener;
35+
import org.eclipse.swt.SWT;
3836
import org.eclipse.swt.events.SelectionAdapter;
3937
import org.eclipse.swt.events.SelectionEvent;
4038
import org.eclipse.swt.graphics.Color;
@@ -324,14 +322,10 @@ public void widgetSelected(SelectionEvent e) {
324322
textLogScaleOffset.setText("");
325323
GridData textLogScaleOffsetGridData = new GridData(SWT.FILL, SWT.CENTER, true, true);
326324
textLogScaleOffset.setLayoutData(textLogScaleOffsetGridData);
327-
textLogScaleOffset.addModifyListener(new ModifyListener() {
325+
textLogScaleOffset.addModifyListener(e -> {
328326

329-
@Override
330-
public void modifyText(ModifyEvent e) {
331-
332-
if(!txtLogScaleOffsetIgnoreEvent && usingOffsetLogScale) {
333-
updateXYGraph();
334-
}
327+
if(!txtLogScaleOffsetIgnoreEvent && usingOffsetLogScale) {
328+
updateXYGraph();
335329
}
336330
});
337331
// xygraph goes here

‎openchrom/plugins/net.openchrom.msd.process.supplier.cms.ui/src/net/openchrom/msd/process/supplier/cms/ui/parts/swt/CompositeCorrelationsUI.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2025 Walter Whitlock, Philip Wenig.
2+
* Copyright (c) 2017, 2026 Walter Whitlock, Philip Wenig.
33
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
@@ -22,9 +22,7 @@
2222
import org.eclipse.nebula.visualization.xygraph.dataprovider.CircularBufferDataProvider;
2323
import org.eclipse.nebula.visualization.xygraph.figures.Trace;
2424
import org.eclipse.nebula.visualization.xygraph.figures.XYGraph;
25-
import org.eclipse.swt.SWT;
26-
import org.eclipse.swt.events.ModifyEvent;
27-
import org.eclipse.swt.events.ModifyListener;
25+
import org.eclipse.swt.SWT;
2826
import org.eclipse.swt.graphics.Color;
2927
import org.eclipse.swt.layout.FillLayout;
3028
import org.eclipse.swt.layout.GridData;
@@ -89,14 +87,10 @@ private void initialize() {
8987
GridData spinnerLeftScanNumberGridData = new GridData(SWT.RIGHT, SWT.CENTER, false, true);
9088
spinnerLeftScanNumberGridData.widthHint = 32;
9189
spinnerTopSelect.setLayoutData(spinnerLeftScanNumberGridData);
92-
spinnerTopSelect.addModifyListener(new ModifyListener() {
90+
spinnerTopSelect.addModifyListener(e -> {
9391

94-
@Override
95-
public void modifyText(ModifyEvent e) {
96-
97-
maxTop = spinnerTopSelect.getSelection();
98-
updateXYGraph();
99-
}
92+
maxTop = spinnerTopSelect.getSelection();
93+
updateXYGraph();
10094
});
10195

10296
Composite compositeGraph = new Composite(this, SWT.NONE);

‎openchrom/plugins/net.openchrom.msd.process.supplier.cms.ui/src/net/openchrom/msd/process/supplier/cms/ui/parts/swt/CompositeLibrarySpectraUI.java‎

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
import org.eclipse.swt.SWT;
3030
import org.eclipse.swt.custom.TableEditor;
3131
import org.eclipse.swt.events.ControlAdapter;
32-
import org.eclipse.swt.events.ControlEvent;
33-
import org.eclipse.swt.events.ModifyEvent;
34-
import org.eclipse.swt.events.ModifyListener;
32+
import org.eclipse.swt.events.ControlEvent;
3533
import org.eclipse.swt.events.SelectionAdapter;
3634
import org.eclipse.swt.events.SelectionEvent;
3735
import org.eclipse.swt.graphics.Point;
@@ -41,11 +39,9 @@
4139
import org.eclipse.swt.widgets.Button;
4240
import org.eclipse.swt.widgets.Composite;
4341
import org.eclipse.swt.widgets.Control;
44-
import org.eclipse.swt.widgets.Display;
45-
import org.eclipse.swt.widgets.Event;
42+
import org.eclipse.swt.widgets.Display;
4643
import org.eclipse.swt.widgets.FileDialog;
47-
import org.eclipse.swt.widgets.List;
48-
import org.eclipse.swt.widgets.Listener;
44+
import org.eclipse.swt.widgets.List;
4945
import org.eclipse.swt.widgets.Table;
5046
import org.eclipse.swt.widgets.TableColumn;
5147
import org.eclipse.swt.widgets.TableItem;
@@ -154,49 +150,41 @@ private void addComponentTable(Composite comp) {
154150
tableEditor.grabHorizontal = true;
155151
tableEditor.minimumWidth = 50;
156152

157-
tableCmsComponents.addListener(SWT.MouseDown, new Listener() {
153+
tableCmsComponents.addListener(SWT.MouseDown, event -> {
158154

159-
@Override
160-
public void handleEvent(Event event) {
161-
162-
Point pt = new Point(event.x, event.y);
163-
// Clean up any previous editor control
164-
Control oldEditor = tableEditor.getEditor();
165-
if(oldEditor != null) {
166-
oldEditor.dispose();
167-
}
168-
TableItem item = tableCmsComponents.getItem(pt);
169-
if(item != null) {
170-
/* Iterate over all columns and check if event is contained */
171-
for(int col = 0; col < tableCmsComponents.getColumnCount(); col++) {
172-
Rectangle rect = item.getBounds(col);
173-
int rowIndex;
174-
if(rect.contains(pt) && (null != cmsLibSpectra) && (0 <= (rowIndex = tableCmsComponents.indexOf(item)))) {
175-
ICalibratedVendorLibraryMassSpectrum libSpectrum = (ICalibratedVendorLibraryMassSpectrum)cmsLibSpectra.getList().get(rowIndex);
176-
if(COLUMN_1 == col) {
177-
libSpectrum.setSelected(!libSpectrum.isSelected());
178-
item.setText(makeTableStrings(libSpectrum, libSpectrum.isSelected()));
179-
} else if(COLUMN_0 == col) {
180-
// The control that will be the editor must be a child of the Table
181-
Text newEditor = new Text(tableCmsComponents, SWT.NONE);
182-
newEditor.setText(item.getText(COLUMN_0));
183-
newEditor.addModifyListener(new ModifyListener() {
184-
185-
@Override
186-
public void modifyText(ModifyEvent e) {
187-
188-
Text text = (Text)tableEditor.getEditor();
189-
if(isValidDoubleString(text.getText())) {
190-
tableEditor.getItem().setText(COLUMN_0, text.getText());
191-
libSpectrum.setScaleFactor(Double.parseDouble(text.getText()));
192-
item.setText(makeTableStrings(libSpectrum, libSpectrum.isSelected()));
193-
}
194-
}
195-
});
196-
newEditor.selectAll();
197-
newEditor.setFocus();
198-
tableEditor.setEditor(newEditor, item, COLUMN_0);
199-
}
155+
Point pt = new Point(event.x, event.y);
156+
// Clean up any previous editor control
157+
Control oldEditor = tableEditor.getEditor();
158+
if(oldEditor != null) {
159+
oldEditor.dispose();
160+
}
161+
TableItem item = tableCmsComponents.getItem(pt);
162+
if(item != null) {
163+
/* Iterate over all columns and check if event is contained */
164+
for(int col = 0; col < tableCmsComponents.getColumnCount(); col++) {
165+
Rectangle rect = item.getBounds(col);
166+
int rowIndex;
167+
if(rect.contains(pt) && (null != cmsLibSpectra) && (0 <= (rowIndex = tableCmsComponents.indexOf(item)))) {
168+
ICalibratedVendorLibraryMassSpectrum libSpectrum = (ICalibratedVendorLibraryMassSpectrum)cmsLibSpectra.getList().get(rowIndex);
169+
if(COLUMN_1 == col) {
170+
libSpectrum.setSelected(!libSpectrum.isSelected());
171+
item.setText(makeTableStrings(libSpectrum, libSpectrum.isSelected()));
172+
} else if(COLUMN_0 == col) {
173+
// The control that will be the editor must be a child of the Table
174+
Text newEditor = new Text(tableCmsComponents, SWT.NONE);
175+
newEditor.setText(item.getText(COLUMN_0));
176+
newEditor.addModifyListener(e -> {
177+
178+
Text text = (Text)tableEditor.getEditor();
179+
if(isValidDoubleString(text.getText())) {
180+
tableEditor.getItem().setText(COLUMN_0, text.getText());
181+
libSpectrum.setScaleFactor(Double.parseDouble(text.getText()));
182+
item.setText(makeTableStrings(libSpectrum, libSpectrum.isSelected()));
183+
}
184+
});
185+
newEditor.selectAll();
186+
newEditor.setFocus();
187+
tableEditor.setEditor(newEditor, item, COLUMN_0);
200188
}
201189
}
202190
}

‎openchrom/plugins/net.openchrom.msd.process.supplier.cms.ui/src/net/openchrom/msd/process/supplier/cms/ui/parts/swt/DecompositionResultUI.java‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import org.eclipse.jface.preference.PreferenceManager;
3434
import org.eclipse.jface.preference.PreferenceNode;
3535
import org.eclipse.swt.SWT;
36-
import org.eclipse.swt.events.ModifyEvent;
37-
import org.eclipse.swt.events.ModifyListener;
3836
import org.eclipse.swt.events.SelectionAdapter;
3937
import org.eclipse.swt.events.SelectionEvent;
4038
import org.eclipse.swt.layout.FillLayout;
@@ -305,19 +303,15 @@ private void addSelectLeftSpectrum(Composite parent) {
305303
GridData spinnerLeftScanNumberGridData = new GridData(SWT.RIGHT, SWT.CENTER, false, true);
306304
spinnerLeftScanNumberGridData.widthHint = 32;
307305
spinnerLeftScanNumber.setLayoutData(spinnerLeftScanNumberGridData);
308-
spinnerLeftScanNumber.addModifyListener(new ModifyListener() {
306+
spinnerLeftScanNumber.addModifyListener(e -> {
309307

310-
@Override
311-
public void modifyText(ModifyEvent e) {
312-
313-
if(spinnersIgnoreChange) {
314-
return;
315-
}
316-
if(spinnerLeftScanNumber.getSelection() >= spinnerRightScanNumber.getSelection()) {
317-
spinnerLeftScanNumber.setSelection(spinnerRightScanNumber.getSelection() - 1);
318-
}
319-
updateTextLeftETimes(cmsSpectra);
308+
if(spinnersIgnoreChange) {
309+
return;
310+
}
311+
if(spinnerLeftScanNumber.getSelection() >= spinnerRightScanNumber.getSelection()) {
312+
spinnerLeftScanNumber.setSelection(spinnerRightScanNumber.getSelection() - 1);
320313
}
314+
updateTextLeftETimes(cmsSpectra);
321315
});
322316
}
323317

@@ -355,19 +349,15 @@ private void addSelectRightSpectrum(Composite parent) {
355349
GridData spinnerRightScanNumberGridData = new GridData(SWT.RIGHT, SWT.CENTER, false, true);
356350
spinnerRightScanNumberGridData.widthHint = 32;
357351
spinnerRightScanNumber.setLayoutData(spinnerRightScanNumberGridData);
358-
spinnerRightScanNumber.addModifyListener(new ModifyListener() {
352+
spinnerRightScanNumber.addModifyListener(e -> {
359353

360-
@Override
361-
public void modifyText(ModifyEvent e) {
362-
363-
if(spinnersIgnoreChange) {
364-
return;
365-
}
366-
if(spinnerRightScanNumber.getSelection() <= spinnerLeftScanNumber.getSelection()) {
367-
spinnerRightScanNumber.setSelection(spinnerLeftScanNumber.getSelection() + 1);
368-
}
369-
updateTextRightETimes(cmsSpectra);
354+
if(spinnersIgnoreChange) {
355+
return;
356+
}
357+
if(spinnerRightScanNumber.getSelection() <= spinnerLeftScanNumber.getSelection()) {
358+
spinnerRightScanNumber.setSelection(spinnerLeftScanNumber.getSelection() + 1);
370359
}
360+
updateTextRightETimes(cmsSpectra);
371361
});
372362
}
373363

0 commit comments

Comments
 (0)